Converted the remaining GPU bots to recipes.

masters/master.tryserver.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import socket
@@ skipping 1993 matching lines @@
 )
 
 gpu_test_suite = [
   'content_gl_tests',
   'gles2_conform_test',
   'gl_tests',
   'gpu_content_tests',
 ]
 
 # GPU try bots
-b_linux_gpu = CreateBuilder(
-    platform='linux',
-    target='Debug',
-    options=['chromium_gpu_debug_builder'],
-    tests=gpu_test_suite,
-    goma=True,
-    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='linux_gpu')
-
-b_win_gpu = CreateBuilder(
-    target='Debug',
-    platform='win32',
-    options=['chromium_gpu_debug_builder'],
-    tests=gpu_test_suite,
-    factory_properties={
-      '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'
 b_linux_nacl_sdk = CreateBuilder(
     platform='linux',
     target='Release',
     options=['chromium_builder_qa'],
     tests=['annotated_steps'],
     factory_properties={'annotated_script': nacl_sdk_script},
     builder_name='linux_nacl_sdk',
@@ skipping 126 matching lines @@
   b_win_chrome_frame,
   b_swarm,
   b_linux_chromeos_clang,
   b_linux_futura, b_linux_aura, b_win7_aura, b_win8_aura,
   b_linux_asan, b_linux_browser_asan, b_linux_clang_tsan,
   b_linux_chromeos_asan,
   b_mac_asan, b_mac_xcodebuild,
   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,
   b_linux_perf_bisect,
   b_mac_perf_bisect,
   b_win_perf_bisect,
   b_android_gn_perf_bisect,
   b_android_nexus4_perf_bisect,
   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.
 slaves = slaves_list.SlavesList('slaves.cfg', 'TryServer')
 
 for builder in c['builders']:
   # Associate the slaves to the builders. The configuration is in slaves.cfg.
   builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
   # Don't enable auto_reboot for people testing locally.
   builder.setdefault('auto_reboot', ActiveMaster.is_production_host)
@@ skipping 147 matching lines @@
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 if ActiveMaster.is_production_host:
   c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
 else:
   c['buildbotURL'] = 'http://%s:%d/' % (
       socket.getfqdn(), ActiveMaster.master_port)
 
 # vi: set ts=4 sts=2 sw=2 et: