Revert of Re-land r289084 - "Make telemetry*_unittests upload to test-results.appspot.com"

scripts/slave/recipe_modules/chromium/api.py

Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py
index f9fab772d2e1f588ff17ed2c6fe47282405e273c..242884ada87608a70f0111c0276d5773c338e9cf 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -309,47 +309,35 @@
         **kwargs)
 
   def run_telemetry_unittests(self, suffix=None, cmd_args=None, **kwargs):
-    return self._run_telemetry_script(
-        'telemetry_unittests',
-        self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'),
-        suffix, cmd_args, **kwargs)
-
-  def run_telemetry_perf_unittests(self, suffix=None, cmd_args=None, **kwargs):
-    return self._run_telemetry_script(
-        'telemetry_perf_unittests',
-        self.m.path['checkout'].join('tools', 'perf', 'run_tests'),
-        suffix, cmd_args, **kwargs)
-
-  def _run_telemetry_script(self, name, script_path, suffix,
-                            cmd_args, **kwargs):
-    test_type = name
+    name = 'telemetry_unittests'
     if suffix:
       name += ' (%s)' % suffix
     cmd_args = cmd_args or []
-
     args = ['--browser=%s' % self.c.build_config_fs.lower(),
-            '--retry-limit=3']
-
-    if not self.m.tryserver.is_tryserver:
-      chromium_revision = self.m.bot_update.properties['got_revision']
-      blink_revision = self.m.bot_update.properties['got_webkit_revision']
-      args += [
-          '--builder-name=%s' % self.m.properties['buildername'],
-          '--master-name=%s' % self.m.properties['mastername'],
-          '--test-results-server=%s' % 'test-results.appspot.com',
-          '--metadata', 'chromium_revision=%s' % chromium_revision,
-          '--metadata', 'blink_revision=%s' % blink_revision,
-          '--metadata', 'build_number=%s' % self.m.properties['buildnumber'],
-      ]
-
-    args += cmd_args
-
+            '--retry-limit=3'] + cmd_args
     return self.runtest(
-        script_path,
+        self.m.path['checkout'].join('tools', 'telemetry', 'run_tests'),
         args=args,
         annotate='gtest',
         name=name,
-        test_type=test_type,
+        test_type='telemetry_unittests',
+        python_mode=True,
+        xvfb=True,
+        **kwargs)
+
+  def run_telemetry_perf_unittests(self, suffix=None, cmd_args=None, **kwargs):
+    name = 'telemetry_perf_unittests'
+    if suffix:
+      name += ' (%s)' % suffix
+    cmd_args = cmd_args or []
+    args = ['--browser=%s' % self.c.build_config_fs.lower(),
+            '--retry-limit=3'] + cmd_args
+    return self.runtest(
+        self.m.path['checkout'].join('tools', 'perf', 'run_tests'),
+        args=args,
+        annotate='gtest',
+        name=name,
+        test_type='telemetry_perf_unittests',
         python_mode=True,
         xvfb=True,
         **kwargs)