Rework how bots get the version of Blink.

masters/master.chromium.webkit/master_android_contentshell_latest_cfg.py

 # Copyright (c) 2013 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 master import master_config
 from master.factory import chromium_factory
 
 import config
 
@@ skipping 21 matching lines @@
 #
 S('s4_contentshell_webkit_rel', branch='trunk', treeStableTimer=60)
 
 #
 # Content Shell Layouttests
 #
 B('WebKit (Content Shell) Android', 'f_contentshell_android_rel',
   scheduler='s4_contentshell_webkit_rel')
 
 F('f_contentshell_android_rel',
-  linux_android().ChromiumWebkitLatestAnnotationFactory(
+  linux_android().ChromiumAnnotationFactory(
     annotation_script='src/build/android/buildbot/bb_run_bot.py',
     factory_properties={
         'additional_drt_flag': '--dump-render-tree',
         'additional_expectations': [
             [ 'third_party',
               'WebKit',
               'LayoutTests',
               'platform',
               'chromium',
               'ContentShellTestExpectations' ],
         ],
         'android_bot_id': 'webkit-latest-contentshell-rel',
         'archive_webkit_results': ActiveMaster.is_production_host,
         'driver_name': 'content_shell',
         'generate_gtest_json': True,
         'test_results_server': 'test-results.appspot.com',
+        'blink_config': 'blink',
         }))
 
 def Update(_config, active_master, c):
   return helper.Update(c)