Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_mac_webkit_latest_cfg.py

 # 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.
 
 # WebKit test builders using the Skia graphics library.
 #
 # Note that we use the builder vs tester role separation differently
 # here than in our other buildbot configurations.
 #
 # In this configuration, the testers build the tests themselves rather than
@@ skipping 44 matching lines @@
 # Triggerable scheduler for testers
 #
 T('s5_webkit_rel_trigger')
 
 #
 # Mac Rel Builder
 #
 B('WebKit Mac Builder', 'f_webkit_mac_rel', gatekeeper='compile',
   auto_reboot=False, scheduler='s5_webkit_rel',
   builddir='webkit-mac-latest-rel')
-F('f_webkit_mac_rel', mac().ChromiumWebkitLatestFactory(
+F('f_webkit_mac_rel', mac().ChromiumFactory(
     slave_type='Builder',
     options=['--build-tool=ninja', '--compiler=goma-clang', '--',
         'test_shell', 'test_shell_tests', 'webkit_unit_tests',
         'DumpRenderTree'],
     factory_properties={
         'trigger': 's5_webkit_rel_trigger',
         'gclient_env': {
             'GYP_DEFINES':'fastbuild=1',
             'GYP_GENERATORS':'ninja',
         },
         'layout_test_platform': 'chromium-mac',
+        'blink_config': 'blink',
     }))
 
 #
 # Mac Rel WebKit testers
 #
 
 B('WebKit Mac10.6', 'f_webkit_rel_tests_106', scheduler='s5_webkit_rel_trigger')
-F('f_webkit_rel_tests_106', mac().ChromiumWebkitLatestFactory(
+F('f_webkit_rel_tests_106', mac().ChromiumFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=[
       'test_shell',
       'webkit',
       'webkit_lint',
       'webkit_unit',
     ],
     factory_properties={
         'archive_webkit_results': ActiveMaster.is_production_host,
         'generate_gtest_json': True,
         'layout_test_platform': 'chromium-mac',
         'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
     }))
 
 B('WebKit Mac10.7', 'f_webkit_rel_tests_107', scheduler='s5_webkit_rel_trigger')
-F('f_webkit_rel_tests_107', mac().ChromiumWebkitLatestFactory(
+F('f_webkit_rel_tests_107', mac().ChromiumFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=[
       'test_shell',
       'webkit',
       'webkit_lint',
       'webkit_unit',
     ],
     factory_properties={
         'archive_webkit_results': ActiveMaster.is_production_host,
         'generate_gtest_json': True,
         'layout_test_platform': 'chromium-mac',
         'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
     }))
 
 B('WebKit Mac10.8', 'f_webkit_rel_tests_108', auto_reboot=False,
   scheduler='s5_webkit_rel_trigger')
-F('f_webkit_rel_tests_108', mac().ChromiumWebkitLatestFactory(
+F('f_webkit_rel_tests_108', mac().ChromiumFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=[
       'test_shell',
       'webkit',
       'webkit_lint',
       'webkit_unit',
     ],
     factory_properties={
         'archive_webkit_results': ActiveMaster.is_production_host,
         'generate_gtest_json': True,
         'layout_test_platform': 'chromium-mac',
         'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
     }))
 
 ################################################################################
 ## Debug
 ################################################################################
 
 # Archive location
 dbg_archive = master_config.GetArchiveUrl('ChromiumWebkit',
                                           'WebKit Mac Builder (dbg)',
                                           'webkit-mac-latest-dbg', 'mac')
 
 #
 # Main debug scheduler for the builder
 #
 S('s5_webkit_dbg', branch='trunk', treeStableTimer=60)
 
 #
 # Triggerable scheduler for testers
 #
 T('s5_webkit_dbg_trigger')
 
 #
 # Mac Dbg Builder
 #
 B('WebKit Mac Builder (dbg)', 'f_webkit_mac_dbg', auto_reboot=False,
   scheduler='s5_webkit_dbg', builddir='webkit-mac-latest-dbg')
-F('f_webkit_mac_dbg', mac().ChromiumWebkitLatestFactory(
+F('f_webkit_mac_dbg', mac().ChromiumFactory(
     target='Debug',
     slave_type='Builder',
     options=['--build-tool=ninja', '--compiler=goma-clang', '--',
         'test_shell', 'test_shell_tests', 'webkit_unit_tests',
         'DumpRenderTree'],
     factory_properties={
         'trigger': 's5_webkit_dbg_trigger',
         'gclient_env': {
             'GYP_GENERATORS':'ninja',
         },
         'layout_test_platform': 'chromium-mac',
+        'blink_config': 'blink',
     }))
 
 #
 # Mac Dbg WebKit testers
 #
 
 B('WebKit Mac10.6 (dbg)', 'f_webkit_dbg_tests',
   scheduler='s5_webkit_dbg_trigger')
-F('f_webkit_dbg_tests', mac().ChromiumWebkitLatestFactory(
+F('f_webkit_dbg_tests', mac().ChromiumFactory(
     target='Debug',
     slave_type='Tester',
     build_url=dbg_archive,
     tests=[
       'test_shell',
       'webkit',
       'webkit_lint',
       'webkit_unit',
     ],
     factory_properties={
         'archive_webkit_results': ActiveMaster.is_production_host,
         'generate_gtest_json': True,
         'layout_test_platform': 'chromium-mac',
         'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
     }))
 
 B('WebKit Mac10.7 (dbg)', 'f_webkit_dbg_tests',
   scheduler='s5_webkit_dbg_trigger')
 
 
 ################################################################################
 ##
 ################################################################################
 
 def Update(_config, active_master, c):
   return helper.Update(c)