(Re-land) Switch remaining bots to new Telemetry GPU isolate.

scripts/slave/recipe_modules/gpu/api.py

Index: scripts/slave/recipe_modules/gpu/api.py
diff --git a/scripts/slave/recipe_modules/gpu/api.py b/scripts/slave/recipe_modules/gpu/api.py
index d59f12251d7aa8d75e61c736dabcb320dd8e3416..72029b27f03fc3c9d3dddc6c3f579cae9677e156 100644
--- a/scripts/slave/recipe_modules/gpu/api.py
+++ b/scripts/slave/recipe_modules/gpu/api.py
@@ -203,7 +203,6 @@ class GpuApi(recipe_api.RecipeApi):
     isolates = common.GPU_ISOLATES
     if self.is_fyi_waterfall:
       isolates += common.FYI_GPU_ISOLATES
-      isolates += common.TELEMETRY_GPU_NEW_ISOLATE
       if self.m.platform.is_win or self.m.platform.is_linux:
         # TODO(kbr): run these tests on the trybots as soon as there is
         # capacity to do so, and on all platforms as soon as ANGLE does.
@@ -600,30 +599,28 @@ class GpuApi(recipe_api.RecipeApi):
       extra_browser_args_string += ' ' + ' '.join(extra_browser_args)
     test_args.append(extra_browser_args_string)
 
-    # Run the new Telemetry GPU test isolate on the FYI waterfall.
-    # Once it's running well on all platforms, the old isolate, and
-    # the code which launches it, will be removed.
-    if self.is_fyi_waterfall:
-      # The step name must end in 'test' or 'tests' in order for the
-      # results to automatically show up on the flakiness dashboard.
-      # (At least, this was true some time ago.) Continue to use this
-      # naming convention for the time being to minimize changes.
-      step_name = name
-      if not (step_name.endswith('test') or step_name.endswith('tests')):
-        step_name = '%s_tests' % step_name
-      # Prepend Telemetry GPU-specific flags.
-      benchmark_name = target_name or name
-      prefix_args = [
-        benchmark_name, '--show-stdout',
-        '--browser=%s' % self.m.chromium.c.build_config_fs.lower() ]
+    # The step name must end in 'test' or 'tests' in order for the
+    # results to automatically show up on the flakiness dashboard.
+    # (At least, this was true some time ago.) Continue to use this
+    # naming convention for the time being to minimize changes.
+    step_name = name
+    if not (step_name.endswith('test') or step_name.endswith('tests')):
+      step_name = '%s_tests' % step_name
+    # Prepend Telemetry GPU-specific flags.
+    benchmark_name = target_name or name
+    prefix_args = [
+      benchmark_name, '--show-stdout',
+      '--browser=%s' % self.m.chromium.c.build_config_fs.lower() ]
+    if enable_swarming:
+      return self.m.chromium_tests.steps.SwarmingIsolatedScriptTest(
+          name, args=prefix_args + test_args,
+          target_name='telemetry_gpu_new_test',
+          dimensions=swarming_dimensions,
+          tags={'gpu_test:1'},
+          extra_suffix=self._get_gpu_suffix(swarming_dimensions),
+          override_compile_targets=['telemetry_gpu_new_test_run'])
+    else:
       return self.m.chromium_tests.steps.LocalIsolatedScriptTest(
           step_name, args=prefix_args + test_args,
           target_name='telemetry_gpu_new_test',
           override_compile_targets=['telemetry_gpu_new_test_run'])
-    else:
-      return self.m.chromium_tests.steps.TelemetryGPUTest(
-          name, chrome_revision, webkit_revision, args=test_args,
-          target_name=target_name, enable_swarming=enable_swarming,
-          swarming_dimensions=swarming_dimensions,
-          master_class_name=self._master_class_name_for_testing,
-          swarming_extra_suffix=self._get_gpu_suffix(swarming_dimensions))