a1f1a940862e45b2b1581a8684afe1180a5c41d2 - chromium/src.git

commit	a1f1a940862e45b2b1581a8684afe1180a5c41d2	[log] [tgz]
author	[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>	Sat Jul 12 07:36:30 2014
committer	[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>	Sat Jul 12 07:36:30 2014
tree	379d350ae15ee35f2f3aae01fbdd8675c2b211d6
parent	e2ec579c6772fd67a58f4fafdd8206b1d5c3c439 [diff]

Revert 282795 "Have media content and chrome browser tests load ..."

It broke browser tests. Probably need to update isolate files to fix it...

> Have media content and chrome browser tests load data from media/test/data
> 
> With media files copied over to media/test/data, this CL makes media related content browser tests and chrome browser tests load test data from one location. 
> 
> The location is common with media unit tests data forder;  managed in one place in media/base/test_data_util.h 
> 
> BUG=379314
> 
> Review URL: https://codereview.chromium.org/357413002

[email protected]

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282812 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.html[Renamed from media/test/data/eme_player.html - diff]
chrome/test/data/media/eme_player_js/app_loader.js[Renamed from media/test/data/eme_player_js/app_loader.js - diff]
chrome/test/data/media/eme_player_js/clearkey_player.js[Renamed from media/test/data/eme_player_js/clearkey_player.js - diff]
chrome/test/data/media/eme_player_js/eme_app.js[Renamed from media/test/data/eme_player_js/eme_app.js - diff]
chrome/test/data/media/eme_player_js/file_io_test_player.js[Renamed from media/test/data/eme_player_js/file_io_test_player.js - diff]
chrome/test/data/media/eme_player_js/fps_observer.js[Renamed from media/test/data/eme_player_js/fps_observer.js - diff]
chrome/test/data/media/eme_player_js/globals.js[Renamed from media/test/data/eme_player_js/globals.js - diff]
chrome/test/data/media/eme_player_js/media_source_utils.js[Renamed from media/test/data/eme_player_js/media_source_utils.js - diff]
chrome/test/data/media/eme_player_js/player_utils.js[Renamed from media/test/data/eme_player_js/player_utils.js - diff]
chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js[Renamed from media/test/data/eme_player_js/prefixed_clearkey_player.js - diff]
chrome/test/data/media/eme_player_js/prefixed_widevine_player.js[Renamed from media/test/data/eme_player_js/prefixed_widevine_player.js - diff]
chrome/test/data/media/eme_player_js/test_config.js[Added - diff]
chrome/test/data/media/eme_player_js/utils.js[Renamed from media/test/data/eme_player_js/utils.js - diff]
chrome/test/data/media/eme_player_js/widevine_player.js[Renamed from media/test/data/eme_player_js/widevine_player.js - diff]
chrome/test/data/media/encrypted_frame_size_change.html[Renamed from media/test/data/encrypted_frame_size_change.html - diff]
chrome/test/data/media/frame_size_change-av-enc-v.webm[Added - diff]
chrome/test/data/media/mse_config_change.html[Renamed from media/test/data/mse_config_change.html - diff]
chrome/test/data/media/test_key_system_instantiation.html[Renamed from media/test/data/test_key_system_instantiation.html - 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/blackwhite.html[Renamed from media/test/data/blackwhite.html - diff]
content/test/data/media/encrypted_frame_size_change.html[Added - diff]
content/test/data/media/encrypted_media_player.html[Added - diff]
content/test/data/media/encrypted_media_utils.js[Added - diff]
content/test/data/media/media_source_player.html[Renamed from media/test/data/media_source_player.html - diff]
content/test/data/media/media_source_utils.js[Added - diff]
content/test/data/media/media_utils.js[Added - diff]
content/test/data/media/mse_config_change.html[Copied from media/test/data/mse_config_change.html - diff]
content/test/data/media/player.html[Renamed from media/test/data/player.html - 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/eme_player_js/test_config.js[Deleted - diff]

40 files changed