Make chromium.perf waterfall use official builds on Win.

masters/master.chromium.perf/master.cfg

Index: masters/master.chromium.perf/master.cfg
===================================================================
--- masters/master.chromium.perf/master.cfg	(revision 234817)
+++ masters/master.chromium.perf/master.cfg	(working copy)
@@ -204,14 +204,17 @@
 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')
@@ -230,40 +233,37 @@
 # 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',
-                         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_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,},
+    )
 
-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,