Rework how bots get the version of Blink.

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index a3ba91ee672cdf7d5765b5443f60534ce7ce8b71..025df0cfd59a00849b2a2e18ea1cf258204bd260 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -1239,7 +1239,7 @@ b_coverage_linux = {
 b_linux_layout = {
   'name': 'linux_layout',
   'slavebuilddir': 'linux_layout',
-  'factory': m_chromium_linux.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_linux.ChromiumFactory(
       slave_type='Trybot',
       target='Debug',
       tests=[
@@ -1255,14 +1255,16 @@ b_linux_layout = {
       factory_properties={
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
-        }}),
+        },
+        'blink_config': 'blink',
+      }),
 }
 
 b_linux_layout_rel = {
   'name': 'linux_layout_rel',
   # Reuse the directory.
   'slavebuilddir': 'linux_layout',
-  'factory': m_chromium_linux.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_linux.ChromiumFactory(
       slave_type='Trybot',
       target='Release',
       tests=[
@@ -1278,13 +1280,15 @@ b_linux_layout_rel = {
       factory_properties={
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
-        }}),
+        },
+        'blink_config': 'blink',
+      }),
 }
 
 b_mac_layout = {
   'name': 'mac_layout',
   'slavebuilddir': 'mac_layout',
-  'factory': m_chromium_mac_ninja.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_mac_ninja.ChromiumFactory(
       slave_type='Trybot',
       target='Debug',
       tests=[
@@ -1301,13 +1305,15 @@ b_mac_layout = {
       factory_properties={
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
-        }}),
+        },
+        'blink_config': 'blink',
+      }),
 }
 
 b_mac_layout_alt = {
   'name': 'mac_layout_alt',
   'slavebuilddir': 'mac_layout',
-  'factory': m_chromium_mac.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_mac.ChromiumFactory(
       slave_type='Trybot',
       target='Debug',
       tests=[
@@ -1320,14 +1326,17 @@ b_mac_layout_alt = {
         '--compiler=goma-clang',
         '--',
         '-project', '../webkit/webkit.xcodeproj',
-      ]),
+      ], 
+      factory_properties={
+        'blink_config': 'blink',
+      }),
 }
 
 b_mac_layout_rel = {
   'name': 'mac_layout_rel',
   # Reuse the directory.
   'slavebuilddir': 'mac_layout',
-  'factory': m_chromium_mac_ninja.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_mac_ninja.ChromiumFactory(
       slave_type='Trybot',
       target='Release',
       tests=[
@@ -1344,14 +1353,16 @@ b_mac_layout_rel = {
       factory_properties={
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
-        }}),
+        },
+        'blink_config': 'blink',
+      }),
 }
 
 b_mac_layout_rel_alt = {
   'name': 'mac_layout_rel_alt',
   # Reuse the directory.
   'slavebuilddir': 'mac_layout',
-  'factory': m_chromium_mac.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_mac.ChromiumFactory(
       slave_type='Trybot',
       target='Release',
       tests=[
@@ -1363,13 +1374,16 @@ b_mac_layout_rel_alt = {
       options=[
         '--compiler=goma-clang',
         '--', '-project', '../webkit/webkit.xcodeproj',
-      ]),
+      ],
+      factory_properties={
+        'blink_config': 'blink',
+      }),
 }
 
 b_win_layout = {
   'name': 'win_layout',
   'slavebuilddir': 'win_layout',
-  'factory': m_chromium_win_ninja.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_win_ninja.ChromiumFactory(
       slave_type='Trybot',
       target='Debug',
       options=['--build-tool=ninja', '--compiler=goma',
@@ -1384,14 +1398,16 @@ b_win_layout = {
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
           'GYP_DEFINES': 'chromium_win_pch=0',
-        }
-      })}
+        },
+        'blink_config': 'blink',
+      }),
+}
 
 b_win_layout_rel = {
   'name': 'win_layout_rel',
   # Reuse the directory.
   'slavebuilddir': 'win_layout',
-  'factory': m_chromium_win_ninja.ChromiumWebkitLatestFactory(
+  'factory': m_chromium_win_ninja.ChromiumFactory(
       slave_type='Trybot',
       target='Release',
       options=['--build-tool=ninja', '--compiler=goma',
@@ -1406,8 +1422,10 @@ b_win_layout_rel = {
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
           'GYP_DEFINES': 'chromium_win_pch=0 fastbuild=1',
-        }
-      })}
+        },
+        'blink_config': 'blink',
+      }),
+}
 
 
 # Chrome Frame builder