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

scripts/slave/recipe_modules/chromium/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from slave import recipe_api
 from slave import recipe_util
 
 from . import builders
 from . import steps
 
@@ skipping 291 matching lines @@
         results_directory=results_directory,
         python_mode=True,
         spawn_dbus=spawn_dbus,
         revision=revision,
         webkit_revision=webkit_revision,
         master_class_name=master_class_name,
         env=env,
         **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)
 
   def runhooks(self, **kwargs):
     """Run the build-configuration hooks for chromium."""
     env = kwargs.get('env', {})
     if self.c.project_generator.tool == 'gyp':
       env.update(self.c.gyp_env.as_jsonish())
     else:
       env['GYP_CHROMIUM_NO_ACTION'] = 1
     kwargs['env'] = env
     self.m.gclient.runhooks(**kwargs)
@@ skipping 190 matching lines @@
     # Chromium workspace.
     if self.m.platform.is_win:
       self.m.python(
           name='get_vs_toolchain_if_necessary',
           script=self.m.path['depot_tools'].join(
               'win_toolchain', 'get_toolchain_if_necessary.py'),
           args=[
               '27eac9b2869ef6c89391f305a3f01285ea317867',
               '9d9a93134b3eabd003b85b4e7dea06c0eae150ed',
           ])