slave_hosts_cfg: Use new Windows GCE instances, use fewer, 16-core GCE instances

master/master_builders_cfg.py

 # 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.
 
 # Sets up all the builders we want this buildbot master to run.
 
 
 #pylint: disable=C0301
 
 
@@ skipping 370 matching lines @@
       'interactive_ui_tests', 'sync_integration_tests'
   ]
   #
   #                          CANARY BUILDERS
   #
   #    Project,  OS,            Compiler,Arch,     Configuration,   Flavor,  Workdir,GYP_DEFINES,Factory,  Target, Scheduler,   Extra Args
   #
   canaries = [
       ('Chrome', 'Ubuntu13.10', 'Ninja', 'x86_64', 'DRT',            None,     'src',  None,       f_drt,    LINUX,  S_PERCOMMIT, {'path_to_skia': ['third_party', 'skia']}),
       ('Chrome', 'Ubuntu13.10', 'Ninja', 'x86_64', 'ToT',            'chrome', 'src',  None,       f_canary, LINUX,  S_PERCOMMIT, {'flavor': 'chrome', 'build_targets': chrome_build_targets, 'path_to_skia': ['third_party', 'skia']}),
-      ('Chrome', 'Win7',        'Ninja', 'x86',    'SharedLib_ToT',  'chrome', 'src',  GYP_SHARED, f_canary, WIN32,  S_PERCOMMIT, {'flavor': 'chrome', 'build_targets': chrome_build_targets, 'path_to_skia': ['third_party', 'skia']}),
+      ('Chrome', 'Win',         'Ninja', 'x86',    'SharedLib_ToT',  'chrome', 'src',  GYP_SHARED, f_canary, WIN32,  S_PERCOMMIT, {'flavor': 'chrome', 'build_targets': chrome_build_targets, 'path_to_skia': ['third_party', 'skia']}),
   ]
 
   setup_builders_from_config_list(canaries, helper, do_upload_render_results,
                                   do_upload_bench_results, CanaryBuilder)
 
 
 def setup_all_builders(helper, do_upload_render_results,
                        do_upload_bench_results):
   """Set up all builders for this master.
 
@@ skipping 51 matching lines @@
       # To resolve https://code.google.com/p/skia/issues/detail?id=2432
       # ('buildbots: don't run UpdateScripts if running on non-production
       # master'), I wanted to add a third boolean flag (do_update_scripts),
       # but I saw that I would need to add it in so many places I was
       # discouraged.  If the merged all the flags into a single object it
       # would be easier to add more flags.
       do_upload_render_results=active_master.do_upload_render_results,
       do_upload_bench_results=active_master.do_upload_bench_results)
 
   return helper.Update(cfg)