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

scripts/slave/recipe_modules/isolate/api.py

 # Copyright 2014 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 recipe_engine import recipe_api
 
 
 class IsolateApi(recipe_api.RecipeApi):
   """APIs for interacting with isolates."""
 
@@ skipping 225 matching lines @@
     self.m.chromium.runtest(
         self._run_isolated_path,
         args=self.runtest_args_list(test, args),
         # We must use the name of the test as the name in order to avoid
         # duplicate steps called "run_isolated".
         name=name or test,
         revision=revision,
         webkit_revision=webkit_revision,
         **runtest_kwargs)
 
+  def run_telemetry_test(self, isolate_name, test, revision, webkit_revision,
+                         **runtest_kwargs):
+    """Runs a Telemetry test which has previously isolated to the server.
+
+    Uses runtest_args_list, above, and delegates to
+    api.chromium.run_telemetry_test.
+    """
+    self.m.chromium.run_telemetry_test(
+        self._run_isolated_path,
+        test,
+        # When running the Telemetry test via an isolate we need to tell
+        # run_isolated.py the hash and isolate server first, and then give
+        # the isolate the test name and other arguments separately.
+        prefix_args=self.runtest_args_list(isolate_name),
+        revision=revision,
+        webkit_revision=webkit_revision,
+        **runtest_kwargs)
+
   def remove_build_metadata(self):
     """Removes the build metadata embedded in the build artifacts."""
     args = [
         '--build-dir', self.m.chromium.output_dir,
         '--src-dir', self.m.path['checkout']
     ]
     # Turn the failures during this step into warnings, it's a best effort step
     # that shouldn't break the build for now.
     try:
       self.m.python('remove_build_metadata',
                     self.resource('remove_build_metadata.py'),
                     args=args,
                     cwd=self.m.path['slave_build'])
     except self.m.step.StepFailure:
       step_result = self.m.step.active_result
       step_result.presentation.status = self.m.step.WARNING
 
   def compare_build_artifacts(self, first_dir, second_dir):
     """Compare the artifacts from 2 builds."""
     args = [
         '--first-build-dir', first_dir,
         '--second-build-dir', second_dir,
         '--target-platform', self.m.chromium.c.TARGET_PLATFORM
     ]
     self.m.python('compare_build_artifacts',
                   self.resource('compare_build_artifacts.py'),
                   args=args,
                   cwd=self.m.path['slave_build'])