|
Revert 284489 "Have media content and chrome browser tests load ..."
This broke the linux gn bot:
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/9676/steps/compile/logs/stdio
[824/4367 | 164.256] CXX
obj/media/video/capture/media_unittests.fake_video_capture_device_unittest.o
FAILED: ../../third_party/llvm-build/Release+Asserts/bin/clang++
-Wl,--fatal-warnings -m64 -fPIC -Wl,-z,noexecstack -Wl,-z,now
-Wl,-z,relro -B../../third_party/binutils/Linux_x64/Release/bin
-Wl,--icf=none -pthread -Wl,-rpath=\\\$ORIGIN/lib/
-Wl,-rpath-link=lib/ -o ffmpeg_unittests -Wl,--start-group
@ffmpeg_unittests.rsp -Wl,--end-group -ldl -lasound -lX11
-lXcomposite -lXcursor -lXdamage -lXext -lXfixes -lXi -lXrender -lXss
-lXtst -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0
-lnss3 -lnssutil3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lfontconfig
-lfreetype -lpangocairo-1.0 -lpango-1.0 -lcairo
obj/media/base/media_test_support.test_data_util.o:../../media/base/test_data_util.cc:function
media::StartMediaHttpTestServer():error: undefined reference to
'net::BaseTestServer::kLocalhost'
obj/media/base/media_test_support.test_data_util.o:../../media/base/test_data_util.cc:function
media::StartMediaHttpTestServer():error: undefined reference to
'net::LocalTestServer::LocalTestServer(net::BaseTestServer::Type,
std::string const&, base::FilePath const&)'
obj/media/base/media_test_support.test_data_util.o:../../media/base/test_data_util.cc:function
media::StartMediaHttpTestServer():error: undefined reference to
'net::LocalTestServer::Start()'
clang:error: linker command failed with exit code 1 (use -v to see
invocation)
...
> 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 identical to r282795 which got reverted, i.e. revert of revert).
>
> The fix was submitted separately in r283757
>
> BUG= 379314
>
> Review URL: https://codereview.chromium.org/398823004
TBR=shadi@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=284495
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+140 lines, -1822 lines) |
Patch |
 |
M |
trunk/src/chrome/browser/media/encrypted_media_browsertest.cc
|
View
|
|
14 chunks |
+28 lines, -31 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
View
|
|
2 chunks |
+3 lines, -5 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/media/media_browsertest.h
|
View
|
|
3 chunks |
+8 lines, -7 lines |
0 comments
|
Download
|
 |
M |
trunk/src/chrome/browser/media/media_browsertest.cc
|
View
|
|
3 chunks |
+30 lines, -17 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/app_loader.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/clearkey_player.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/eme_app.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/file_io_test_player.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/fps_observer.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/globals.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/media_source_utils.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/player_utils.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/prefixed_clearkey_player.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/prefixed_widevine_player.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/test_config.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/utils.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/eme_player_js/widevine_player.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/encrypted_frame_size_change.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/frame_size_change-av-enc-v.webm
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/mse_config_change.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/chrome/test/data/media/test_key_system_instantiation.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/media/encrypted_media_browsertest.cc
|
View
|
|
7 chunks |
+31 lines, -40 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/media/media_browsertest.h
|
View
|
|
3 chunks |
+10 lines, -9 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/media/media_browsertest.cc
|
View
|
|
7 chunks |
+46 lines, -43 lines |
0 comments
|
Download
|
 |
M |
trunk/src/content/browser/media/media_source_browsertest.cc
|
View
|
|
2 chunks |
+7 lines, -11 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/blackwhite.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/encrypted_frame_size_change.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/encrypted_media_player.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/encrypted_media_utils.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/media_source_player.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/media_source_utils.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/media_utils.js
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/mse_config_change.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
A + |
trunk/src/content/test/data/media/player.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
 |
M |
trunk/src/media/DEPS
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
trunk/src/media/base/test_data_util.h
|
View
|
|
1 chunk |
+0 lines, -15 lines |
0 comments
|
Download
|
 |
M |
trunk/src/media/base/test_data_util.cc
|
View
|
|
1 chunk |
+4 lines, -28 lines |
0 comments
|
Download
|
 |
M |
trunk/src/media/media.gyp
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/blackwhite.html
|
View
|
|
1 chunk |
+0 lines, -231 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player.html
|
View
|
|
1 chunk |
+0 lines, -108 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/app_loader.js
|
View
|
|
1 chunk |
+0 lines, -24 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/clearkey_player.js
|
View
|
|
1 chunk |
+0 lines, -33 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/eme_app.js
|
View
|
|
1 chunk |
+0 lines, -81 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/file_io_test_player.js
|
View
|
|
1 chunk |
+0 lines, -34 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/fps_observer.js
|
View
|
|
1 chunk |
+0 lines, -67 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/globals.js
|
View
|
|
1 chunk |
+0 lines, -80 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/media_source_utils.js
|
View
|
|
1 chunk |
+0 lines, -70 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/player_utils.js
|
View
|
|
1 chunk |
+0 lines, -186 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/prefixed_clearkey_player.js
|
View
|
|
1 chunk |
+0 lines, -27 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/prefixed_widevine_player.js
|
View
|
|
1 chunk |
+0 lines, -32 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/test_config.js
|
View
|
|
1 chunk |
+0 lines, -65 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/utils.js
|
View
|
|
1 chunk |
+0 lines, -245 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/eme_player_js/widevine_player.js
|
View
|
|
1 chunk |
+0 lines, -38 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/encrypted_frame_size_change.html
|
View
|
|
1 chunk |
+0 lines, -50 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/media_source_player.html
|
View
|
|
1 chunk |
+0 lines, -38 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/mse_config_change.html
|
View
|
|
1 chunk |
+0 lines, -134 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/player.html
|
View
|
|
1 chunk |
+0 lines, -77 lines |
0 comments
|
Download
|
 |
D |
trunk/src/media/test/data/test_key_system_instantiation.html
|
View
|
|
1 chunk |
+0 lines, -21 lines |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|