Added support for properly building and running isolates in recipes.

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 981c17f9a40769f8cfc180daa01c264488718191..28b33615280157e84a8c6682a7070dbb62adf7cd 100644
--- a/scripts/slave/recipe_modules/gpu/api.py
+++ b/scripts/slave/recipe_modules/gpu/api.py
@@ -7,7 +7,6 @@ from slave import recipe_api
 SIMPLE_TESTS_TO_RUN = [
   'content_gl_tests',
   'gles2_conform_test',
-  'gl_tests',
   'angle_unittests'
 ]
 
@@ -60,6 +59,13 @@ class GpuApi(recipe_api.RecipeApi):
 
     self.m.chromium.c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
 
+    # Isolates don't work with the component build yet.
+    # Fortunately, we can easily tell which GPU bots are using the
+    # component build -- all of those building or testing Debug.
+    self._use_isolates = self.m.chromium.is_release_build
+    if self._use_isolates:
+      self.m.isolate.set_isolate_environment(self.m.chromium.c)
+
   def checkout_steps(self):
     # Always force a gclient-revert in order to avoid problems when
     # directories are added to, removed from, and re-added to the repo.
@@ -77,6 +83,9 @@ class GpuApi(recipe_api.RecipeApi):
     # Since performance tests aren't run on the debug builders, it isn't
     # necessary to build all of the targets there.
     build_tag = '' if self.m.chromium.is_release_build else 'debug_'
+    # It's harmless to process the isolate-related targets even if they
+    # aren't supported on the current configuration (because the component
+    # build is used).
     yield self.m.chromium.compile(
         targets=['chromium_gpu_%sbuilder' % build_tag, 'gl_tests_run'])
     # This is only an initial test of the isolate upload path; the
@@ -122,7 +131,12 @@ class GpuApi(recipe_api.RecipeApi):
 
     # Note: --no-xvfb is the default.
     for test in SIMPLE_TESTS_TO_RUN:
-      yield self.m.chromium.runtests(test, spawn_dbus=True)
+      yield self.m.chromium.runtests(test)
+
+    if self._use_isolates:
+      yield self.m.isolate.run_isolate_test('gl_tests')
+    else:
+      yield self.m.chromium.runtests('gl_tests')
 
     # Choose a reasonable default for the location of the sandbox binary
     # on the bots.