Revert "Switch remaining bots to new Telemetry GPU isolate."

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.
 
 import re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.Placeholder):
@@ skipping 422 matching lines @@
         allow_subannotations=True,
         env=self.get_env(),
         **kwargs)
     return step_result.json.output['clang_revision']
 
 
   @property
   def is_release_build(self):
     return self.c.BUILD_CONFIG == 'Release'
 
+  def run_telemetry_test(self, runner, test, name, args=None,
+                         prefix_args=None, results_directory='',
+                         spawn_dbus=False, revision=None, webkit_revision=None,
+                         master_class_name=None, **kwargs):
+    """Runs a Telemetry based test with 'runner' as the executable.
+    Automatically passes certain flags like --output-format=gtest to the
+    test runner. 'prefix_args' are passed before the built-in arguments and
+    'args'."""
+    # Choose a reasonable default for the location of the sandbox binary
+    # on the bots.
+    env = {}
+    if self.m.platform.is_linux:
+      env['CHROME_DEVEL_SANDBOX'] = self.m.path.join(
+        '/opt', 'chromium', 'chrome_sandbox')
+
+    # The step name must end in 'test' or 'tests' in order for the results to
+    # automatically show up on the flakiness dashboard.
+    if not (name.endswith('test') or name.endswith('tests')):
+      name = '%s_tests' % name
+
+    test_args = []
+    if prefix_args:
+      test_args.extend(prefix_args)
+    test_args.extend([test,
+                      '--show-stdout',
+                      '--output-format=gtest',
+                      '--browser=%s' % self.c.build_config_fs.lower()])
+    if args:
+      test_args.extend(args)
+
+    if not results_directory:
+      results_directory = self.m.path['slave_build'].join('gtest-results', name)
+
+    return self.runtest(
+        runner,
+        test_args,
+        annotate='gtest',
+        name=name,
+        test_type=name,
+        generate_json_file=True,
+        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_benchmark(self, benchmark_name, cmd_args=None, env=None):
     cmd_args = cmd_args or []
     args = [
         '--browser=%s' % self.c.build_config_fs.lower(),
         benchmark_name
     ]
     return self.m.python(
         'Telemetry benchmark: %s' % benchmark_name,
         self.m.path['checkout'].join('tools', 'perf', 'run_benchmark'),
         args=cmd_args + args,
@@ skipping 262 matching lines @@
           args=[
               '27eac9b2869ef6c89391f305a3f01285ea317867',
               '9d9a93134b3eabd003b85b4e7dea06c0eae150ed',
           ])
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))