Android: do not run telemetry directly.

scripts/slave/unittests/telemetry_test.py

Index: scripts/slave/unittests/telemetry_test.py
diff --git a/scripts/slave/unittests/telemetry_test.py b/scripts/slave/unittests/telemetry_test.py
index fb0a38bd07ee0b33a0e5f8811326d23dd4561f75..5a23df3ae77c81d28d42f5e314a27465fc83fd73 100755
--- a/scripts/slave/unittests/telemetry_test.py
+++ b/scripts/slave/unittests/telemetry_test.py
@@ -74,8 +74,7 @@ class TelemetryTest(unittest.TestCase):
 
     runtest = os.path.abspath(os.path.join(SCRIPT_DIR, '..', 'runtest.py'))
 
-    expectedText = (['\'adb\' \'root\'',
-        '\'adb\' \'wait-for-device\'',
+    expectedText = ([
         '\'%s\' ' % sys.executable +
         '\'%s\' \'--run-python-script\' \'--target\' \'Release\' ' % runtest +
             '\'--build-dir\' \'src/build\' \'--no-xvfb\' ' +
@@ -85,11 +84,10 @@ class TelemetryTest(unittest.TestCase):
             '"step_name": "sunspider", "test_name": "sunspider", ' +
             '"target_platform": "linux2", "target_os": "android", ' +
             '"show_perf_results": true}\' ' +
-            '\'src/tools/perf/run_benchmark\' \'-v\' ' +
-            '\'--output-format=buildbot\' ' +
-            '\'--browser=android-chromium-testshell\' \'sunspider\''
+            '\'src/build/android/test_runner.py\' \'perf\' ' +
+            '\'--print\' ' +
+            '\'sunspider\''
         ])
-
     self.assertEqual(expectedText, self.capture.text)
 
   def testExtraArg(self):
@@ -104,8 +102,7 @@ class TelemetryTest(unittest.TestCase):
 
     runtest = os.path.abspath(os.path.join(SCRIPT_DIR, '..', 'runtest.py'))
 
-    expectedText = (['\'adb\' \'root\'',
-        '\'adb\' \'wait-for-device\'',
+    expectedText = ([
         '\'%s\' ' % sys.executable +
         '\'%s\' \'--run-python-script\' \'--target\' \'Release\' ' % runtest +
             '\'--build-dir\' \'src/build\' \'--no-xvfb\' ' +
@@ -116,10 +113,9 @@ class TelemetryTest(unittest.TestCase):
             '"step_name": "sunspider", "test_name": "sunspider", ' +
             '"target_platform": "linux2", "target_os": "android", ' +
             '"show_perf_results": true}\' ' +
-            '\'src/tools/perf/run_benchmark\' \'-v\' ' +
-            '\'--output-format=buildbot\' ' +
-            '\'--profile-dir=fake_dir\' '+
-            '\'--browser=android-chromium-testshell\' \'sunspider\''
+            '\'src/build/android/test_runner.py\' \'perf\' ' +
+            '\'--print\' ' +
+            '\'sunspider\''
         ])
 
     self.assertEqual(expectedText, self.capture.text)