Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_win_gpu_latest_cfg.py

Index: masters/master.chromium.webkit/master_win_gpu_latest_cfg.py
diff --git a/masters/master.chromium.webkit/master_win_gpu_latest_cfg.py b/masters/master.chromium.webkit/master_win_gpu_latest_cfg.py
index 26aaddeee29e326bbf601208645c636de338a95c..04a6c7d5fc0652d9316e1a0dea44a81aea30dc0d 100644
--- a/masters/master.chromium.webkit/master_win_gpu_latest_cfg.py
+++ b/masters/master.chromium.webkit/master_win_gpu_latest_cfg.py
@@ -29,7 +29,7 @@ S('s9_gpu_win_webkit_rel', branch='trunk', treeStableTimer=60)
 #
 B('GPU Win7 (NVIDIA)', 'f_gpu_win_rel',
   scheduler='s9_gpu_win_webkit_rel')
-F('f_gpu_win_rel', win().ChromiumWebkitLatestFactory(
+F('f_gpu_win_rel', win().ChromiumFactory(
     target='Release',
     slave_type='BuilderTester',
     tests=[
@@ -41,11 +41,14 @@ F('f_gpu_win_rel', win().ChromiumWebkitLatestFactory(
       'gpu_content_tests',
     ],
     project='all.sln;chromium_gpu_builder',
-    factory_properties={'generate_gtest_json': True,
-                        'start_crash_handler': True,
-                        'perf_id': 'gpu-webkit-win7-nvidia',
-                        'show_perf_results': True,
-                        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}}))
+    factory_properties={
+        'generate_gtest_json': True,
+        'start_crash_handler': True,
+        'perf_id': 'gpu-webkit-win7-nvidia',
+        'show_perf_results': True,
+        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'},
+        'blink_config': 'blink',
+    }))
 
 ################################################################################
 ## Debug
@@ -62,7 +65,7 @@ S('s9_gpu_win_webkit_dbg', branch='trunk', treeStableTimer=60)
 #
 B('GPU Win7 (dbg) (NVIDIA)', 'f_gpu_win_dbg',
   scheduler='s9_gpu_win_webkit_dbg')
-F('f_gpu_win_dbg', win().ChromiumWebkitLatestFactory(
+F('f_gpu_win_dbg', win().ChromiumFactory(
     target='Debug',
     slave_type='BuilderTester',
     tests=[
@@ -71,9 +74,12 @@ F('f_gpu_win_dbg', win().ChromiumWebkitLatestFactory(
       'gpu_content_tests',
     ],
     project='all.sln;chromium_gpu_debug_builder',
-    factory_properties={'generate_gtest_json': True,
-                        'start_crash_handler': True,
-                        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}}))
+    factory_properties={
+        'generate_gtest_json': True,
+        'start_crash_handler': True,
+        'gclient_env': {'GYP_DEFINES': 'fastbuild=1'},
+        'blink_config': 'blink',
+    }))
 
 
 def Update(config, active_master, c):