Converted the remaining GPU bots to recipes.

masters/master.chromium.webkit/master.cfg

 # 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.
 
 from master import master_utils
 from master import slaves_list
 
 import config
 import master_site_config
 
@@ skipping 15 matching lines @@
 import master_win_webkit_pinned_cfg
 import master_linux_webkit_latest_cfg
 import master_android_webkit_latest_cfg
 import master_mac_webkit_latest_cfg
 import master_win_webkit_latest_cfg
 import master_win_latest_cfg
 import master_chromiumos_latest_cfg
 import master_mac_latest_cfg
 import master_linux_latest_cfg
 import master_android_latest_cfg
-import master_win_gpu_latest_cfg
-import master_mac_gpu_latest_cfg
-import master_linux_gpu_latest_cfg
+import master_gpu_latest_cfg
 
 master_source_cfg.Update(config, ActiveMaster, c)
 master_win_webkit_pinned_cfg.Update(config, ActiveMaster, c)
 master_mac_webkit_pinned_cfg.Update(config, ActiveMaster, c)
 master_linux_webkit_pinned_cfg.Update(config, ActiveMaster, c)
 master_win_webkit_latest_cfg.Update(config, ActiveMaster, c)
 master_mac_webkit_latest_cfg.Update(config, ActiveMaster, c)
 master_linux_webkit_latest_cfg.Update(config, ActiveMaster, c)
 master_android_webkit_latest_cfg.Update(config, ActiveMaster, c)
 master_win_latest_cfg.Update(config, ActiveMaster, c)
 master_mac_latest_cfg.Update(config, ActiveMaster, c)
 master_linux_latest_cfg.Update(config, ActiveMaster, c)
 master_chromiumos_latest_cfg.Update(config, ActiveMaster, c)
 master_android_latest_cfg.Update(config, ActiveMaster, c)
-master_win_gpu_latest_cfg.Update(config, ActiveMaster, c)
-master_mac_gpu_latest_cfg.Update(config, ActiveMaster, c)
-master_linux_gpu_latest_cfg.Update(config, ActiveMaster, c)
+master_gpu_latest_cfg.Update(config, ActiveMaster, c)
 
 # This will be enabled when the master is split.
 if TREE_GATE_KEEPER:
   import master_gatekeeper_cfg
   master_gatekeeper_cfg.Update(config, ActiveMaster, c)
 
 c['logCompressionLimit'] = False
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url
 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.webkit/'
@@ skipping 12 matching lines @@
 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'],
                                            config.Master.GetBotPassword())
 master_utils.VerifySetup(c, slaves)
 
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     order_console_by_time=True,
     enable_http_status_push=ActiveMaster.is_production_host)