Make chromium.perf waterfall use official builds on Win.

masters/master.chromium.perf/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.
 
 # This is the buildmaster config file for the 'chromium' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
@@ skipping 186 matching lines @@
 m_mac = chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin')
 m_android = chromium_factory.ChromiumFactory(
     'src/out', 'linux2', nohooks_on_update=True, target_os='android')
 
 # Some shortcut to simplify the code below.
 F_WIN = m_win.ChromiumFactory
 F_LINUX = m_linux.ChromiumFactory
 F_MAC = m_mac.ChromiumFactory
 F_ANDROID = m_android.ChromiumAnnotationFactory
 
+# --- IMPORTANT ----------------------------------------------------------------
+# chromium.perf produces official builds which should not be publicly available.
+# Never archive to a publicly readable bucket.
 chromium_rel_archive = 'gs://chrome-perf/Win Builder/full-build-win32.zip'
 # In chromium_utils.PlatformName(), x64 is still win32.
 chromium_rel_x64_archive = ('gs://chrome-perf/Win x64 Builder/'
                             'full-build-win32.zip')
 chromium_rel_linux_archive = ('gs://chrome-perf/Linux Builder/'
                               'full-build-linux.zip')
-
 chromium_rel_mac_archive = ('gs://chrome-perf/Mac Builder/full-build-mac.zip')
+# ------------------------------------------------------------------------------
 
 android_rel_archive = master_config.GetGSUtilUrl(
     'chromium-android', 'android_perf_rel')
 
 chromium_perf_archive = master_config.GetGSUtilUrl('chrome-perf', 'Win Builder')
 
 chromium_perf_x64_archive = master_config.GetGSUtilUrl('chrome-perf',
                                                        'Win x64 Builder')
 
 chromium_perf_linux_archive = master_config.GetGSUtilUrl('chrome-perf',
                                                          'Linux Builder')
 
 chromium_perf_mac_archive = master_config.GetGSUtilUrl('chrome-perf',
                                                        'Mac Builder')
 
 # The identifier of the factory is the build configuration. If two factories
 # are using the same build configuration, they should have the same identifier.
 
-FFMPEG_GYP_DEFINES_WIN = (
-  'fastbuild=1 '
-  'ffmpeg_branding=Chrome '
-  'proprietary_codecs=1 '
-)
+# BuilderTesters using a custom build configuration.
+f_cr_rel_builder = F_WIN(
+    slave_type='Builder',
+    mode='google_chrome',
+    compile_timeout=4800,
+    project='all.sln;chromium_builder_perf',
+    factory_properties={
+      'create_profiles': True,
+      'trigger': 'winrel',
+      'gclient_env': {
+        'GYP_DEFINES': 'branding=Chrome buildtype=Official '
+                       'component=static_library',
+        'GYP_MSVS_VERSION': '2010',},
+      'build_url': chromium_perf_archive,},
+    )
 
-# BuilderTesters using a custom build configuration.
-f_cr_rel_builder = F_WIN(slave_type='Builder',
-                         options=[
-                             '--build-tool=ninja', 'chromium_builder_perf'],
-                         factory_properties={
-                            'create_profiles': True,
-                            'trigger': 'winrel',
-                            'gclient_env': {
-                                'GYP_DEFINES': FFMPEG_GYP_DEFINES_WIN,
-                                'GYP_GENERATORS': 'ninja'},
-                            'build_url': chromium_perf_archive,},
-                         )
-
-f_cr_rel_x64_builder = F_WIN(slave_type='Builder',
-                             options=[
-                                 '--build-tool=ninja', 'chromium_builder_perf'],
-                             target='Release_x64',
-                             factory_properties={
-                                'create_profiles': True,
-                                'trigger': 'winrel_x64',
-                                'gclient_env': {
-                                    'GYP_DEFINES': (FFMPEG_GYP_DEFINES_WIN +
-                                        'component=shared_library '
-                                        'target_arch=x64'),
-                                    'GYP_GENERATORS': 'ninja'},
-                                    'GYP_MSVS_VERSION': '2012',
-                                'build_url': chromium_perf_x64_archive,},
-                             )
+f_cr_rel_x64_builder = F_WIN(
+    slave_type='Builder',
+    mode='google_chrome',
+    compile_timeout=4800,
+    project='all.sln;chromium_builder_perf',
+    target='Release_x64',
+    factory_properties={
+      'create_profiles': True,
+      'trigger': 'winrel_x64',
+      'gclient_env': {
+        'GYP_DEFINES': 'branding=Chrome buildtype=Official '
+                       'component=static_library target_arch=x64',
+        'GYP_MSVS_VERSION': '2012',},
+      'build_url': chromium_perf_x64_archive,},
+    )
 
 f_cr_rel_perf_xp_1 = F_WIN(slave_type='Tester',
                            build_url=chromium_rel_archive,
                            tests=['page_cycler_bloat',
                                   'page_cycler_morejs',
                                   'page_cycler_intl_ar_fa_he',
                                   'page_cycler_intl_es_fr_pt-BR',
                                   'page_cycler_intl_hi_ru',
                                   'page_cycler_intl_ja_zh',
                                   'dom_perf',
@@ skipping 1117 matching lines @@
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.Waterfall page) is visible. This
 # typically uses the port number set in the Waterfall 'status' entry, but
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.perf/'