Rework how bots get the version of Blink.

masters/master.tryserver.chromium/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 from buildbot.scheduler import Triggerable
@@ skipping 1221 matching lines @@
       factory_properties={
         'gclient_env': {'GYP_DEFINES': GYP_DEFINES_FOR_COVERAGE},
         'perf_id': 'chromium-dbg-linux-try',
         'use_build_number': True}),
 }
 
 # WebKit Layout builders
 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=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       options=['--build-tool=ninja', '--compiler=goma',
                'test_shell', 'test_shell_tests',
                'webkit_unit_tests', 'DumpRenderTree',
       ],
       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=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       options=['--build-tool=ninja', '--compiler=goma',
                'test_shell', 'test_shell_tests',
                'webkit_unit_tests', 'DumpRenderTree',
       ],
       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=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       options=[
         '--build-tool=ninja', '--compiler=goma-clang',
         '--', 'test_shell', 'test_shell_tests',
               'webkit_unit_tests', 'DumpRenderTree',
       ],
       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=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       options=[
         '--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=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       options=[
         '--build-tool=ninja', '--compiler=goma-clang',
         '--', 'test_shell', 'test_shell_tests',
               'webkit_unit_tests', 'DumpRenderTree',
       ],
       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=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       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',
                '--', 'webkit_builder_win'],
       tests=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       factory_properties={
         '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',
                '--', 'webkit_builder_win'],
       tests=[
         'test_shell',
         'webkit',
         'webkit_lint',
         'webkit_unit',
       ],
       factory_properties={
         'gclient_env': {
           'GYP_GENERATORS': 'ninja',
           'GYP_DEFINES': 'chromium_win_pch=0 fastbuild=1',
-        }
-      })}
+        },
+        'blink_config': 'blink',
+      }),
+}
 
 
 # Chrome Frame builder
 b_win_chrome_frame = CreateBuilder(
     platform='win32',
     target='Debug',
     builder_name='win_cf',
     options=['chromium_builder_win_cf'],
     tests=[
       'chrome_frame_net_tests',
@@ skipping 661 matching lines @@
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.chromium/'
 
 # vi: set ts=4 sts=2 sw=2 et: