Rework how bots get the version of Blink.

masters/master.devtools/master.cfg

 # Copyright (c) 2011 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 buildbot.changes import svnpoller
 from buildbot.scheduler import Scheduler
 from master import build_utils
 from master import master_utils
 from master import slaves_list
 from master.factory import chromium_factory
@@ skipping 35 matching lines @@
 webkit_poller = svnpoller.SVNPoller(svnurl = config.Master.webkit_root_url,
                                     split_file=WebkitFileSplitter,
                                     pollinterval=30,
                                     revlinktmpl=webkit_url)
 
 c['change_source'] = [cr_poller, webkit_poller]
 
 
 def linux(): return chromium_factory.ChromiumFactory('src/build', 'linux2')
 
-factory_release = linux().ChromiumWebkitLatestFactory(
+factory_release = linux().ChromiumFactory(
     target='Release',
     tests=['devtools_perf'],
     options=['--build-tool=ninja',
              '--compiler=goma',
              'DumpRenderTree',
              'chrome',
              'pyautolib',
              'chromedriver'],
     factory_properties={
       'perf_id': 'chromium-devtools-perf',
       'show_perf_results': True,
       'gclient_env': {
           'GYP_DEFINES':'release_extra_cflags="-fno-omit-frame-pointer"'
-      }
-    }
-  )
+      },
+      'blink_config': 'blink',
+    })
 
 builder_release = {
   'name': 'x64 Release',
   'builddir': 'DevTools_Release',
   'factory': factory_release,
   'category': 'Linux',
   'auto_reboot': False
 }
 
 
-factory_debug = linux().ChromiumWebkitLatestFactory(
+factory_debug = linux().ChromiumFactory(
     target='Debug',
     tests=['devtools_perf'],
     options=['--build-tool=ninja',
              '--compiler=goma',
              'DumpRenderTree',
              'chrome',
              'pyautolib',
              'chromedriver'],
     factory_properties={
       'perf_id': 'chromium-devtools-perf-debug',
       'show_perf_results': True,
-    }
-  )
+      'blink_config': 'blink',
+    })
 
 builder_debug = {
   'name': 'x64 Debug',
   'builddir': 'DevTools_Debug',
   'factory': factory_debug,
   'category': 'Linux',
   'auto_reboot': False
 }
 
-factory_release_clang = linux().ChromiumWebkitLatestFactory(
+factory_release_clang = linux().ChromiumFactory(
     target='Release',
     tests=['devtools_perf'],
     options=['--build-tool=ninja',
              '--compiler=goma-clang',
              'DumpRenderTree',
              'chrome',
              'pyautolib',
              'chromedriver'],
     factory_properties={
       'perf_id': 'chromium-devtools-perf-clang-release',
       'show_perf_results': True,
       'gclient_env': {
           'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1'
-      }
-    }
-  )
+      },
+      'blink_config': 'blink',
+    })
 
 builder_release_clang = {
   'name': 'x64 Release Clang',
   'builddir': 'DevTools_Release_Clang',
   'factory': factory_release_clang,
   'category': 'Linux',
   'auto_reboot': False
 }
 
 c['builders'] = [builder_release, builder_debug, builder_release_clang]
@@ skipping 28 matching lines @@
 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'],
                                            config.Master.GetBotPassword())
 master_utils.VerifySetup(c, slaves)
 
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     order_console_by_time=True,
     enable_http_status_push=ActiveMaster.is_production_host)