Use MSVS2015 for the fyi PGO builds

scripts/slave/recipe_modules/pgo/api.py

 # Copyright 2014 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 recipe_engine import recipe_api
 
 
 # List of the benchmark that we run during the profiling step.
 #
 # TODO(sebmarchand): Move this into a BenchmarkSuite in telemetry, this way
@@ skipping 30 matching lines @@
 
   def __init__(self, **kwargs):
     super(PGOApi, self).__init__(**kwargs)
 
   def _compile_instrumented_image(self, bot_config):
     """
     Generates the instrumented version of the binaries.
     """
     self.m.chromium.set_config(bot_config['chromium_config_instrument'],
                                **bot_config.get('chromium_config_kwargs'))
+    for c in bot_config.get('chromium_apply_config', []):
+      self.m.chromium.apply_config(c)
     self.m.chromium.runhooks(name='Runhooks: Instrumentation phase.')
     # Remove the profile files from the previous builds.
     self.m.file.rmwildcard('*.pg[cd]', str(self.m.chromium.output_dir))
     self.m.chromium.compile(name='Compile: Instrumentation phase.',
                             force_clobber=bot_config.get('clobber', False))
 
   def _run_pgo_benchmarks(self):
     """
     Run a suite of telemetry benchmarks to generate some profiling data.
     """
@@ skipping 15 matching lines @@
         # benchmark.
         step_result = self.m.step.active_result
         step_result.presentation.status = self.m.step.WARNING
 
   def _compile_optimized_image(self, bot_config):
     """
     Generates the optimized version of the binaries.
     """
     self.m.chromium.set_config(bot_config['chromium_config_optimize'],
                                **bot_config.get('chromium_config_kwargs'))
+    for c in bot_config.get('chromium_apply_config', []):
+      self.m.chromium.apply_config(c)
     self.m.chromium.runhooks(name='Runhooks: Optimization phase.')
 
     # Increase the stack size of pgomgr.exe.
     #
     # TODO(sebmarchand): Remove this once the bug has been fixed.
     self.m.python('increase pgomgr.exe stack size',
         self.resource('increase_pgomgr_stack_size.py'),
         args=[self.m.path['depot_tools'].join(
             'win_toolchain', 'vs2013_files', 'VC', 'bin', 'amd64_x86')],
         cwd=self.m.path['slave_build'])
@@ skipping 27 matching lines @@
 
       # Third step: Compilation of the optimized build, this will use the
       #     profile data files produced by the previous step.
       self._compile_optimized_image(bot_config)
     except self.m.step.StepFailure as e:
       if bot_config.get('fail_silently'):
         step_result = self.m.step.active_result
         step_result.presentation.status = self.m.step.WARNING
       else:
         raise e