Roll chromium_revision 22b81f6c45..d604de96c9 (459032:459307)

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 67e1d7587d3280e83a85e7623d8d180916a503ac..f6ffb866efcff5e62c2a95286b43c6b32cf08397 100755
--- a/tools-webrtc/mb/mb_unittest.py
+++ b/tools-webrtc/mb/mb_unittest.py
@@ -378,18 +378,10 @@ class UnitTest(unittest.TestCase):
 
     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 @@ class UnitTest(unittest.TestCase):
 
     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):