Public Git Hosting - chromium-blink-merge.git/commit

commit	a1f1a940862e45b2b1581a8684afe1180a5c41d2
author	shadi@google.com <shadi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
	Sat, 12 Jul 2014 07:36:30 +0000 (12 07:36 +0000)
committer	shadi@google.com <shadi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
	Sat, 12 Jul 2014 07:36:30 +0000 (12 07:36 +0000)
tree	379d350ae15ee35f2f3aae01fbdd8675c2b211d6	tree \| snapshot (tar.gz zip)
parent	e2ec579c6772fd67a58f4fafdd8206b1d5c3c439	commit \| 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

TBR=shadi@chromium.org

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

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

40 files changed:

chrome/browser/media/encrypted_media_browsertest.cc		diff \| blob \| blame \| history
chrome/browser/media/encrypted_media_istypesupported_browsertest.cc		diff \| blob \| blame \| history
chrome/browser/media/media_browsertest.cc		diff \| blob \| blame \| history
chrome/browser/media/media_browsertest.h		diff \| blob \| blame \| history
chrome/test/data/media/eme_player.html	[moved from media/test/data/eme_player.html with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/app_loader.js	[moved from media/test/data/eme_player_js/app_loader.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/clearkey_player.js	[moved from media/test/data/eme_player_js/clearkey_player.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/eme_app.js	[moved from media/test/data/eme_player_js/eme_app.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/file_io_test_player.js	[moved from media/test/data/eme_player_js/file_io_test_player.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/fps_observer.js	[moved from media/test/data/eme_player_js/fps_observer.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/globals.js	[moved from media/test/data/eme_player_js/globals.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/media_source_utils.js	[copied from media/test/data/eme_player_js/media_source_utils.js with 97% similarity]	diff \| blob \| blame \| history
chrome/test/data/media/eme_player_js/player_utils.js	[moved from media/test/data/eme_player_js/player_utils.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js	[moved from media/test/data/eme_player_js/prefixed_clearkey_player.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/prefixed_widevine_player.js	[moved from media/test/data/eme_player_js/prefixed_widevine_player.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/test_config.js	[new file with mode: 0644]	blob
chrome/test/data/media/eme_player_js/utils.js	[moved from media/test/data/eme_player_js/utils.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/eme_player_js/widevine_player.js	[moved from media/test/data/eme_player_js/widevine_player.js with 100% similarity]	blob \| blame \| history
chrome/test/data/media/encrypted_frame_size_change.html	[copied from media/test/data/encrypted_frame_size_change.html with 100% similarity]	blob \| blame \| history
chrome/test/data/media/frame_size_change-av-enc-v.webm	[new file with mode: 0644]	blob
chrome/test/data/media/mse_config_change.html	[copied from media/test/data/mse_config_change.html with 97% similarity]	diff \| blob \| blame \| history
chrome/test/data/media/test_key_system_instantiation.html	[moved from media/test/data/test_key_system_instantiation.html with 90% similarity]	diff \| blob \| blame \| history
content/browser/media/encrypted_media_browsertest.cc		diff \| blob \| blame \| history
content/browser/media/media_browsertest.cc		diff \| blob \| blame \| history
content/browser/media/media_browsertest.h		diff \| blob \| blame \| history
content/browser/media/media_source_browsertest.cc		diff \| blob \| blame \| history
content/test/data/media/blackwhite.html	[moved from media/test/data/blackwhite.html with 100% similarity]	blob \| blame \| history
content/test/data/media/encrypted_frame_size_change.html	[moved from media/test/data/encrypted_frame_size_change.html with 76% similarity]	diff \| blob \| blame \| history
content/test/data/media/encrypted_media_player.html	[new file with mode: 0644]	blob
content/test/data/media/encrypted_media_utils.js	[new file with mode: 0644]	blob
content/test/data/media/media_source_player.html	[moved from media/test/data/media_source_player.html with 60% similarity]	diff \| blob \| blame \| history
content/test/data/media/media_source_utils.js	[moved from media/test/data/eme_player_js/media_source_utils.js with 55% similarity]	diff \| blob \| blame \| history
content/test/data/media/media_utils.js	[new file with mode: 0644]	blob
content/test/data/media/mse_config_change.html	[moved from media/test/data/mse_config_change.html with 78% similarity]	diff \| blob \| blame \| history
content/test/data/media/player.html	[moved from media/test/data/player.html with 100% similarity]	blob \| blame \| history
media/DEPS		diff \| blob \| blame \| history
media/base/test_data_util.cc		diff \| blob \| blame \| history
media/base/test_data_util.h		diff \| blob \| blame \| history
media/media.gyp		diff \| blob \| blame \| history
media/test/data/eme_player_js/test_config.js	[deleted file]	blob \| blame \| history

RSS Atom