Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_mac_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.
 
 from master import master_config
 from master.factory import chromium_factory
 
 defaults = {}
 
 helper = master_config.Helper(defaults)
@@ skipping 14 matching lines @@
 
 #
 # Main release scheduler for webkit
 #
 S('s8_webkit_rel', branch='trunk', treeStableTimer=60)
 
 #
 # Mac Rel Builder
 #
 B('Mac10.6 Tests', 'f_mac_tests_rel', scheduler='s8_webkit_rel')
-F('f_mac_tests_rel', mac_out().ChromiumWebkitLatestFactory(
+F('f_mac_tests_rel', mac_out().ChromiumFactory(
     options=['--build-tool=ninja', '--compiler=goma-clang', '--',
              'chromium_builder_tests'],
     tests=[
       'browser_tests',
       'cc_unittests',
       'content_browsertests',
       'interactive_ui_tests',
       'unit',
       'webkit_compositor_bindings_unittests',
     ],
     factory_properties={
         'generate_gtest_json': True,
         'gclient_env': {
             'GYP_GENERATORS':'ninja',
             'GYP_DEFINES':'fastbuild=1',
         },
+        'blink_config': 'blink',
     }))
 
 B('Mac10.6 Perf', 'f_mac_perf6_rel', scheduler='s8_webkit_rel')
-F('f_mac_perf6_rel', mac_out().ChromiumWebkitLatestFactory(
+F('f_mac_perf6_rel', mac_out().ChromiumFactory(
     options=['--build-tool=ninja', '--compiler=goma-clang', '--',
              'chromium_builder_perf'],
     tests=[
       'dom_perf',
       'dromaeo',
       'memory',
       'page_cycler_bloat',
       'page_cycler_dhtml',
       'page_cycler_indexeddb',
       'page_cycler_intl1',
       'page_cycler_intl2',
       'page_cycler_morejs',
       'page_cycler_moz',
       'startup',
       'sunspider',
       'tab_switching',
       'octane',
     ],
     factory_properties={
         'show_perf_results': True,
         'perf_id': 'chromium-rel-mac6-webkit',
         'gclient_env': {
             'GYP_GENERATORS':'ninja',
             'GYP_DEFINES': 'fastbuild=1',
         },
+        'blink_config': 'blink',
     }))
 
 B('Mac10.8 Tests', 'f_mac_tests_rel_108', scheduler='s8_webkit_rel')
-F('f_mac_tests_rel_108', mac_out().ChromiumWebkitLatestFactory(
+F('f_mac_tests_rel_108', mac_out().ChromiumFactory(
     options=['--build-tool=ninja', '--compiler=goma-clang', '--',
              'chromium_builder_tests'],
     tests=[
       'browser_tests',
       'content_browsertests',
       'interactive_ui_tests',
       'unit',
     ],
     factory_properties={
         'generate_gtest_json': True,
         'gclient_env': {
             'GYP_GENERATORS':'ninja',
             'GYP_DEFINES':'fastbuild=1',
         },
+        'blink_config': 'blink',
     }))
 
 
 ################################################################################
 ## Debug
 ################################################################################
 
 #
 # Main debug scheduler for webkit
 #
 S('s8_webkit_dbg', branch='trunk', treeStableTimer=60)
 
 #
 # Mac Dbg Builder
 #
 B('Mac Builder (dbg)', 'f_mac_dbg', scheduler='s8_webkit_dbg')
-F('f_mac_dbg', mac().ChromiumWebkitLatestFactory(
+F('f_mac_dbg', mac().ChromiumFactory(
     target='Debug',
-    options=['--', '-project', '../webkit/webkit.xcodeproj',]))
+    options=['--', '-project', '../webkit/webkit.xcodeproj',],
+    factory_properties={
+        'blink_config': 'blink',
+    }))
 
 def Update(config, active_master, c):
   return helper.Update(c)