Converted the remaining GPU bots to recipes.

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index 107cbd7901a9dec437c01eebf9695b84aa78b508..0aecad0882392d068c496743b8f1f2ca158db6bb 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -2011,64 +2011,15 @@ gpu_test_suite = [
 ]
 
 # GPU try bots
-b_linux_gpu = CreateBuilder(
-    platform='linux',
-    target='Debug',
-    options=['chromium_gpu_debug_builder'],
-    tests=gpu_test_suite,
-    goma=True,
-    factory_properties={
-      'sharded_tests': [],
-      'gclient_env': {
-        'GYP_DEFINES': 'internal_gles2_conform_tests=1',
-      },
-    },
-    builder_name='linux_gpu')
-
-b_win_gpu = CreateBuilder(
-    target='Debug',
-    platform='win32',
-    options=['chromium_gpu_debug_builder'],
-    tests=gpu_test_suite,
-    factory_properties={
+gpu_builders = []
+for gpu_builder_name in ['linux_gpu', 'win_gpu', 'mac_gpu', 'mac_gpu_retina']:
+  gpu_builders.append({
+    'name': gpu_builder_name,
+    'factory': m_annotator.BaseFactory('gpu', {
       'sharded_tests': [],
-      'gclient_env': {
-        'GYP_DEFINES': 'internal_gles2_conform_tests=1',
-      },
-    },
-    builder_name='win_gpu')
-
-b_mac_gpu = CreateBuilder(
-    platform='mac',
-    target='Debug',
-    options=[
-      'chromium_gpu_debug_builder',
-    ],
-    tests=gpu_test_suite,
-    factory_properties={
-      'gclient_env': {
-        'GYP_DEFINES': 'internal_gles2_conform_tests=1',
-      },
-    },
-    builder_name='mac_gpu',
-    goma=True,
-    clang=True)
-
-b_mac_gpu_retina = CreateBuilder(
-    platform='mac',
-    target='Debug',
-    options=[
-      'chromium_gpu_debug_builder',
-    ],
-    tests=gpu_test_suite,
-    factory_properties={
-      'gclient_env': {
-        'GYP_DEFINES': 'internal_gles2_conform_tests=1',
-      },
-    },
-    builder_name='mac_gpu_retina',
-    goma=True,
-    clang=True)
+      'build_config': 'Debug'
+    })
+  })
 
 # NaCl SDK try bots
 nacl_sdk_script = 'nacl_sdk_buildbot_run.py'
@@ -2215,7 +2166,6 @@ c['builders'] = [
   b_linux_heapcheck,
   b_linux_redux,
   b_cros_pfq_x86, b_cros_pfq_amd64, b_cros_pfq_daisy,
-  b_linux_gpu, b_win_gpu, b_mac_gpu, b_mac_gpu_retina,
   b_linux_nacl_sdk, b_win_nacl_sdk, b_mac_nacl_sdk,
   b_valgrind_mac_alt, b_mac_layout_alt, b_mac_layout_rel_alt,
   b_mac_nacl_sdk_alt,
@@ -2227,7 +2177,7 @@ c['builders'] = [
   b_android_nexus10_perf_bisect,
   b_blink_bare_presubmit, b_blink_presubmit, b_chromium_presubmit,
   b_tools_presubmit,
-] + blink_builders
+] + blink_builders + gpu_builders
 
 
 # Slaves are loaded from slaves.cfg.