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

tools-webrtc/mb/mb_unittest.py

Index: tools-webrtc/mb/mb_unittest.py
diff --git a/tools-webrtc/mb/mb_unittest.py b/tools-webrtc/mb/mb_unittest.py
index 5f442e729aeb95b587c6fc0f42c43ca7ca38e0ad..67e1d7587d3280e83a85e7623d8d180916a503ac 100755
--- a/tools-webrtc/mb/mb_unittest.py
+++ b/tools-webrtc/mb/mb_unittest.py
@@ -379,8 +379,17 @@ class UnitTest(unittest.TestCase):
     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 @@ class UnitTest(unittest.TestCase):
     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):