commit 8430825856dc582c0666c53e173f0d386326597c
author kjellander <kjellander@webrtc.org> Thu Mar 16 01:35:09 2017 -0700
committer Commit bot <commit-bot@chromium.org> Thu Mar 16 08:35:09 2017 +0000
tree c5000b9cc0b54ef77a4df78a3bdfdc923dec32d1
parent 22818a580424c17a964026ecdf20231d5c582a06

Roll chromium_revision 0036d9b08e..2d05f4450c (457220:457366)

Reverting MB changes from https://codereview.webrtc.org/2755433005/
since https://codereview.chromium.org/2695963003 was reverted.

Change log: https://chromium.googlesource.com/chromium/src/+log/0036d9b08e..2d05f4450c
Full diff: https://chromium.googlesource.com/chromium/src/+/0036d9b08e..2d05f4450c

Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/921d4dc4be..536da69816
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/15d5fcab1c..81c2772699
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/6f28a4ab1b..bee9511bdb
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3cc4ea5920..6d32ea1500
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/95b8b082f7..eccad07478
* src/third_party/catapult: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/76b86f523b..faf60eb37f
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/04c6d654f7..b06789b11a
DEPS diff: https://chromium.googlesource.com/chromium/src/+/0036d9b08e..2d05f4450c/DEPS

No update to Clang.

TBR=
BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2753773005
Cr-Commit-Position: refs/heads/master@{#17268}

tools-webrtc/mb/mb_unittest.py

diff --git a/tools-webrtc/mb/mb_unittest.py b/tools-webrtc/mb/mb_unittest.py
index 5f442e7..67e1d75 100755
--- a/tools-webrtc/mb/mb_unittest.py
+++ b/tools-webrtc/mb/mb_unittest.py
@@ -379,8 +379,17 @@
     self.assertEqual(files, ['base_unittests'])
     self.assertEqual(command, [
         './../../build/android/test_wrapper/logdog_wrapper.py',
-        '--target', 'base_unittests',
-        '--logdog-bin-cmd', '../../bin/logdog_butler',
+        '--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',
     ])
 
   def test_gn_gen_swarming_android_junit_test(self):
@@ -410,8 +419,16 @@
     self.assertEqual(files, ['base_unittests'])
     self.assertEqual(command, [
         './../../build/android/test_wrapper/logdog_wrapper.py',
-        '--target', 'base_unittests',
-        '--logdog-bin-cmd', '../../bin/logdog_butler',
+        '--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',
     ])
 
   def test_gn_gen_non_parallel_console_test_launcher(self):