a5f47146e0eb9405273e9c56d78378a71c570b80 - chromium/chromium

commit	a5f47146e0eb9405273e9c56d78378a71c570b80	[log] [tgz]
author	shadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Tue Jul 22 23:33:07 2014
committer	shadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Tue Jul 22 23:33:07 2014
tree	6ec69256955363a93c830bda1c967d8360032442
parent	51ed77e3f37a9a9b80d6d0a8259e84a8ca635259 [diff]

Have media content and chrome browser tests load data from media/test/data

Update remaining encrypted media browser tests to use new player app.

This is similar to r282795 + fix to GN builds. The fix is in
media/BUILD.gn file.

BUG=379314

Review URL: https://codereview.chromium.org/408993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284803 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/media/encrypted_media_browsertest.cc[diff]
chrome/browser/media/encrypted_media_istypesupported_browsertest.cc[diff]
chrome/browser/media/media_browsertest.cc[diff]
chrome/browser/media/media_browsertest.h[diff]
chrome/test/data/media/eme_player_js/test_config.js[Deleted - diff]
chrome/test/data/media/frame_size_change-av-enc-v.webm[Deleted - diff]
content/browser/media/encrypted_media_browsertest.cc[diff]
content/browser/media/media_browsertest.cc[diff]
content/browser/media/media_browsertest.h[diff]
content/browser/media/media_source_browsertest.cc[diff]
content/test/data/media/encrypted_frame_size_change.html[Deleted - diff]
content/test/data/media/encrypted_media_player.html[Deleted - diff]
content/test/data/media/encrypted_media_utils.js[Deleted - diff]
content/test/data/media/media_source_utils.js[Deleted - diff]
content/test/data/media/media_utils.js[Deleted - diff]
content/test/data/media/mse_config_change.html[Deleted - diff]
media/BUILD.gn[diff]
media/DEPS[diff]
media/base/test_data_util.cc[diff]
media/base/test_data_util.h[diff]
media/media.gyp[diff]
media/test/data/blackwhite.html[Renamed from content/test/data/media/blackwhite.html - diff]
media/test/data/eme_player.html[Renamed from chrome/test/data/media/eme_player.html - diff]
media/test/data/eme_player_js/app_loader.js[Renamed from chrome/test/data/media/eme_player_js/app_loader.js - diff]
media/test/data/eme_player_js/clearkey_player.js[Renamed from chrome/test/data/media/eme_player_js/clearkey_player.js - diff]
media/test/data/eme_player_js/eme_app.js[Renamed from chrome/test/data/media/eme_player_js/eme_app.js - diff]
media/test/data/eme_player_js/file_io_test_player.js[Renamed from chrome/test/data/media/eme_player_js/file_io_test_player.js - diff]
media/test/data/eme_player_js/fps_observer.js[Renamed from chrome/test/data/media/eme_player_js/fps_observer.js - diff]
media/test/data/eme_player_js/globals.js[Renamed from chrome/test/data/media/eme_player_js/globals.js - diff]
media/test/data/eme_player_js/media_source_utils.js[Renamed from chrome/test/data/media/eme_player_js/media_source_utils.js - diff]
media/test/data/eme_player_js/player_utils.js[Renamed from chrome/test/data/media/eme_player_js/player_utils.js - diff]
media/test/data/eme_player_js/prefixed_clearkey_player.js[Renamed from chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js - diff]
media/test/data/eme_player_js/prefixed_widevine_player.js[Renamed from chrome/test/data/media/eme_player_js/prefixed_widevine_player.js - diff]
media/test/data/eme_player_js/test_config.js[Added - diff]
media/test/data/eme_player_js/utils.js[Renamed from chrome/test/data/media/eme_player_js/utils.js - diff]
media/test/data/eme_player_js/widevine_player.js[Renamed from chrome/test/data/media/eme_player_js/widevine_player.js - diff]
media/test/data/encrypted_frame_size_change.html[Renamed from chrome/test/data/media/encrypted_frame_size_change.html - diff]
media/test/data/media_source_player.html[Renamed from content/test/data/media/media_source_player.html - diff]
media/test/data/mse_config_change.html[Renamed from chrome/test/data/media/mse_config_change.html - diff]
media/test/data/player.html[Renamed from content/test/data/media/player.html - diff]
media/test/data/test_key_system_instantiation.html[Renamed from chrome/test/data/media/test_key_system_instantiation.html - diff]

41 files changed