Roll chromium_revision 22b81f6c45..d604de96c9 (459032:459307)
MB changes were needed due to https://codereview.chromium.org/2767833002
FullStackTest.ScreenshareSlidesVP9_2SL
test was disabled due to libvpx regression, see webrtc:7401.
Roll chromium_revision 22b81f6c45..d604de96c9 (459032:459307)
Change log: https://chromium.googlesource.com/chromium/src/+log/22b81f6c45..d604de96c9
Full diff: https://chromium.googlesource.com/chromium/src/+/22b81f6c45..d604de96c9
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/258342709c..d49079a0cb
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/4a2354d6ce..a18678dc18
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/f825ec1419..4afbbbaa88
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/83a00745ef..7a028befe4
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/5c1951e265..5903b09f59
* src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/1b6a20ab7e..5c300b0898
* src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/b9acb5c51e..6d2e444456
* src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/8121f85473..2fac50fa0e
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/a4f9a9e9e9..3a6ca3a28a
DEPS diff: https://chromium.googlesource.com/chromium/src/+/22b81f6c45..d604de96c9/DEPS
No update to Clang.
TBR=marpan@webrtc.org,
BUG=webrtc:7401
Review-Url: https://codereview.webrtc.org/2777553002
Cr-Commit-Position: refs/heads/master@{#17376}
diff --git a/DEPS b/DEPS
index 9e936ae..5175e9f 100644
--- a/DEPS
+++ b/DEPS
@@ -2,7 +2,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
- 'chromium_revision': '22b81f6c45350e9f683100023c2a5813b1738cdf',
+ 'chromium_revision': 'd604de96c960021b33f929e9cdf9eca8079ad92b',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@@ -23,7 +23,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
- 'catapult_revision': '1b6a20ab7ee3656e6a23a0a09600401a70887f2b',
+ 'catapult_revision': '5c300b0898debe686d83fc3646b41c5b5e96ab21',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@@ -34,19 +34,19 @@
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- Var('chromium_git') + '/chromium/src/base' + '@' + '258342709c5eef0069232df1dc5c709e29ed864d',
+ Var('chromium_git') + '/chromium/src/base' + '@' + 'd49079a0cb17531f5057cc8de6bf10edabc4e0ef',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '4a2354d6ce34973e7ea64b5cff58e1c3a89ce1e4',
+ Var('chromium_git') + '/chromium/src/build' + '@' + 'a18678dc188ca0c116b6e8c94263d611dd9ad796',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'e6b510a9daf822bbe9f922c200c58150803d2fd8',
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '83a00745ef4e992a1debbb4e8932e63e519cde6b',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + '7a028befe4a4fb87bcfbd8be9e0131708580083c',
'src/testing/gtest':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
'src/testing/gmock':
Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
'src/third_party':
- Var('chromium_git') + '/chromium/src/third_party' + '@' + '5c1951e26566aac67be28b4f770d228644e6c594',
+ Var('chromium_git') + '/chromium/src/third_party' + '@' + '5903b09f59d1130dbeb24a492bcb68280360b683',
'src/third_party/boringssl/src':
Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'),
'src/third_party/catapult':
@@ -54,7 +54,7 @@
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/ffmpeg':
- Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'b9acb5c51eea352657323b33737fee503e42604a',
+ Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '6d2e444456b7694189165076ddfcccdf649147b2',
'src/third_party/jsoncpp/source':
Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248
@@ -67,7 +67,7 @@
'src/third_party/libsrtp':
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + 'd15364a801e42d164486b6c8522bde271b24761d',
'src/third_party/libvpx/source/libvpx':
- Var('chromium_git') + '/webm/libvpx.git' + '@' + '8121f85473b28183c93fdcef290ed6f74b0b52db',
+ Var('chromium_git') + '/webm/libvpx.git' + '@' + '2fac50fa0ee099c632d97a941a9871e7cecbe720',
'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '2adb84e39e360723d19c68f315d99e3e0f88318c',
'src/third_party/openh264/src':
@@ -79,7 +79,7 @@
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + 'a4f9a9e9e912459acf2f8bf5f22ed68cb887eeaa',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + '3a6ca3a28abdd29091c720494125e443d4e9d6ed',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563',
'src/tools/swarming_client':
@@ -119,7 +119,7 @@
},
'ios': {
'src/ios':
- Var('chromium_git') + '/chromium/src/ios' + '@' + 'f825ec1419c92b60d5d4cd89a89143926291da09',
+ Var('chromium_git') + '/chromium/src/ios' + '@' + '4afbbbaa88e3614a5083a83421a4319b441d9350',
},
'unix': {
'src/third_party/lss':
diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py
index 71fd7bf..5e9f388 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools-webrtc/mb/mb.py
@@ -1055,23 +1055,11 @@
extra_files = []
if android:
- logdog_command = [
- '--logdog-bin-cmd', './../../bin/logdog_butler',
- '--project', 'chromium',
- '--service-account-json',
- '/creds/service_accounts/service-account-luci-logdog-publisher.json',
- '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
- '--source', '${ISOLATED_OUTDIR}/logcats',
- '--name', 'unified_logcats',
- ]
- test_cmdline = [
- self.PathJoin('bin', 'run_%s' % target),
- '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
- ]
+ cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py',
+ '--target', target,
+ '--logdog-bin-cmd', '../../bin/logdog_butler']
if test_type != 'junit_test':
- test_cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}',]
- cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
- + logdog_command + test_cmdline + ['-v'])
+ cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}']
else:
extra_files = ['../../testing/test_env.py']
diff --git a/tools-webrtc/mb/mb_unittest.py b/tools-webrtc/mb/mb_unittest.py
index 67e1d75..f6ffb86 100755
--- a/tools-webrtc/mb/mb_unittest.py
+++ b/tools-webrtc/mb/mb_unittest.py
@@ -378,18 +378,10 @@
self.assertEqual(files, ['base_unittests'])
self.assertEqual(command, [
- './../../build/android/test_wrapper/logdog_wrapper.py',
- '--logdog-bin-cmd', './../../bin/logdog_butler',
- '--project', 'chromium',
- '--service-account-json',
- '/creds/service_accounts/service-account-luci-logdog-publisher.json',
- '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
- '--source', '${ISOLATED_OUTDIR}/logcats',
- '--name', 'unified_logcats',
- 'bin/run_base_unittests',
- '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
- '--target-devices-file', '${SWARMING_BOT_FILE}',
- '-v',
+ '../../build/android/test_wrapper/logdog_wrapper.py',
+ '--target', 'base_unittests',
+ '--logdog-bin-cmd', '../../bin/logdog_butler',
+ '--target-devices-file', '${SWARMING_BOT_FILE}'
])
def test_gn_gen_swarming_android_junit_test(self):
@@ -418,17 +410,9 @@
self.assertEqual(files, ['base_unittests'])
self.assertEqual(command, [
- './../../build/android/test_wrapper/logdog_wrapper.py',
- '--logdog-bin-cmd', './../../bin/logdog_butler',
- '--project', 'chromium',
- '--service-account-json',
- '/creds/service_accounts/service-account-luci-logdog-publisher.json',
- '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
- '--source', '${ISOLATED_OUTDIR}/logcats',
- '--name', 'unified_logcats',
- 'bin/run_base_unittests',
- '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
- '-v',
+ '../../build/android/test_wrapper/logdog_wrapper.py',
+ '--target', 'base_unittests',
+ '--logdog-bin-cmd', '../../bin/logdog_butler',
])
def test_gn_gen_non_parallel_console_test_launcher(self):
diff --git a/webrtc/video/full_stack_tests.cc b/webrtc/video/full_stack_tests.cc
index eb7e68b..e6da33f 100644
--- a/webrtc/video/full_stack_tests.cc
+++ b/webrtc/video/full_stack_tests.cc
@@ -399,7 +399,13 @@
false, false, "", "ConferenceMotion_1280_720_50"};
#if !defined(RTC_DISABLE_VP9)
-TEST_F(FullStackTest, ScreenshareSlidesVP9_2SL) {
+// Disabled due to crash on Linux, Win and Android, see bugs.webrtc.org/7401.
+#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
+#define MAYBE_ScreenshareSlidesVP9_2SL DISABLED_ScreenshareSlidesVP9_2SL
+#else
+#define MAYBE_ScreenshareSlidesVP9_2SL ScreenshareSlidesVP9_2SL
+#endif
+TEST_F(FullStackTest, MAYBE_ScreenshareSlidesVP9_2SL) {
VideoQualityTest::Params screenshare;
screenshare.call.send_side_bwe = true;
screenshare.video = {true, 1850, 1110, 5, 50000, 200000, 2000000, false,
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 2cd542a..cf09b3a 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -3151,7 +3151,13 @@
RunBaseTest(&test);
}
-TEST_F(VideoSendStreamTest, Vp9FlexModeRefCount) {
+#if defined(WEBRTC_ANDROID)
+// Crashes on Android; bugs.webrtc.org/7401
+#define MAYBE_Vp9FlexModeRefCount DISABLED_Vp9FlexModeRefCount
+#else
+#define MAYBE_Vp9FlexModeRefCount Vp9FlexModeRefCount
+#endif
+TEST_F(VideoSendStreamTest, MAYBE_Vp9FlexModeRefCount) {
class FlexibleMode : public Vp9HeaderObserver {
void ModifyVideoConfigsHook(
VideoSendStream::Config* send_config,
