Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_win_latest_cfg.py

Index: masters/master.chromium.webkit/master_win_latest_cfg.py
diff --git a/masters/master.chromium.webkit/master_win_latest_cfg.py b/masters/master.chromium.webkit/master_win_latest_cfg.py
index 87f4b898e27d301981538004df6749236afb749d..e8b4217f42d586956acd895c9363877182570a64 100644
--- a/masters/master.chromium.webkit/master_win_latest_cfg.py
+++ b/masters/master.chromium.webkit/master_win_latest_cfg.py
@@ -71,7 +71,7 @@ T('s7_webkit_builder_rel_trigger')
 #
 B('Win Builder', 'f_win_rel', scheduler='s7_webkit_builder_rel',
   builddir='win-latest-rel', auto_reboot=False)
-F('f_win_rel', win().ChromiumWebkitLatestFactory(
+F('f_win_rel', win().ChromiumFactory(
     slave_type='Builder',
     project='all.sln;chromium_builder',
     factory_properties={
@@ -80,6 +80,7 @@ F('f_win_rel', win().ChromiumWebkitLatestFactory(
         'archive_build': True,
         'gs_bucket': 'gs://chromium-webkit-snapshots',
         'gs_acl': 'public-read',
+        'blink_config': 'blink',
     }))
 
 #
@@ -87,7 +88,7 @@ F('f_win_rel', win().ChromiumWebkitLatestFactory(
 #
 # TODO: Switch back to trigger, http://crbug.com/102331
 B('Win7 Perf', 'f_win_rel_perf', scheduler='s7_webkit_builder_rel')
-F('f_win_rel_perf', win().ChromiumWebkitLatestFactory(
+F('f_win_rel_perf', win().ChromiumFactory(
     # TODO: undo, http://crbug.com/102331
     #slave_type='Tester',
     #build_url=rel_archive,
@@ -104,30 +105,34 @@ F('f_win_rel_perf', win().ChromiumWebkitLatestFactory(
       'startup',
       'sunspider',
     ],
-    factory_properties={'perf_id': 'chromium-rel-win7-webkit',
-                        'show_perf_results': True,
-                        'start_crash_handler': True,
-                        # TODO: Remove, http://crbug.com/102331
-                        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'},
-                        }))
+    factory_properties={
+        'perf_id': 'chromium-rel-win7-webkit',
+        'show_perf_results': True,
+        'start_crash_handler': True,
+        # TODO: Remove, http://crbug.com/102331
+        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'},
+        'blink_config': 'blink',
+    }))
 
 B('Vista Tests', 'f_win_rel_tests', scheduler='s7_webkit_builder_rel_trigger')
-F('f_win_rel_tests', win().ChromiumWebkitLatestFactory(
+F('f_win_rel_tests', win().ChromiumFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=[
       'installer',
       'unit',
     ],
-    factory_properties={'perf_id': 'chromium-rel-vista-webkit',
-                        'show_perf_results': True,
-                        'start_crash_handler': True,
-                        'test_results_server': 'test-results.appspot.com',
-                        }))
+    factory_properties={
+        'perf_id': 'chromium-rel-vista-webkit',
+        'show_perf_results': True,
+        'start_crash_handler': True,
+        'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
+    }))
 
 B('Chrome Frame Tests', 'f_cf_rel_tests',
   scheduler='s7_webkit_builder_rel_trigger')
-F('f_cf_rel_tests', win().ChromiumWebkitLatestFactory(
+F('f_cf_rel_tests', win().ChromiumFactory(
     slave_type='Tester',
     build_url=rel_archive,
     tests=[
@@ -135,8 +140,11 @@ F('f_cf_rel_tests', win().ChromiumWebkitLatestFactory(
       'chrome_frame_tests',
       'chrome_frame_unittests',
     ],
-    factory_properties={'process_dumps': True,
-                        'start_crash_handler': True,}))
+    factory_properties={
+        'process_dumps': True,
+        'start_crash_handler': True,
+        'blink_config': 'blink',
+    }))
 
 ################################################################################
 ## Debug
@@ -154,7 +162,7 @@ S('s7_webkit_dbg', branch='trunk', treeStableTimer=60)
 #
 B('Win7 (dbg)', 'f_win_dbg', scheduler='s7_webkit_builder_dbg',
   builddir='win-latest-dbg')
-F('f_win_dbg', win().ChromiumWebkitLatestFactory(
+F('f_win_dbg', win().ChromiumFactory(
     target='Debug',
     project='all.sln;chromium_builder',
     tests=[
@@ -167,7 +175,9 @@ F('f_win_dbg', win().ChromiumWebkitLatestFactory(
         'sharded_tests': sharded_tests,
         'start_crash_handler': True,
         'generate_gtest_json': True,
-        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}}))
+        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'},
+        'blink_config': 'blink',
+    }))
 
 def Update(config, active_master, c):
   return helper.Update(c)