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

master/skia_master_scripts/factory.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.
 
 
 """Utility class to build the Skia master BuildFactory's.
 
 Based on gclient_factory.py and adds Skia-specific steps."""
 
 
@@ skipping 760 matching lines @@
       if not self._build_targets:
         self._build_targets = ['most']
       self.CommonSteps(clobber)
       self.NonPerfSteps()
       self.PerfSteps()
     elif role == builder_name_schema.BUILDER_ROLE_BUILD:
       # Compile-only builder.
       self.UpdateSteps()
       if not self._build_targets:
         self._build_targets = []
-        if (('Win7' in self._builder_name and 'x86_64' in self._builder_name) or
+        if (('Win' in self._builder_name) or
             ('Ubuntu' in self._builder_name and 'x86-' in self._builder_name) or
             'Mac10.6' in self._builder_name or 'Mac10.7' in self._builder_name):
-          # Don't compile the debugger in 64-bit Win7, Mac 10.6, Mac 10.7, or
+          # Don't compile the debugger on Windows, 64-bit Mac 10.6, Mac 10.7, or
           # 32-bit Linux since the Qt SDK doesn't include libraries for those
           # platforms.
           self._build_targets.append('most')
         else:
           self._build_targets.append('everything')
       self.Compile(clobber=clobber,
                    retry_without_werr_on_failure=True)
     else:
       if not self._build_targets:
         self._build_targets = ['most']
       self.CommonSteps(clobber)
       if role == builder_name_schema.BUILDER_ROLE_TEST:
         # Test-running builder.
         self.NonPerfSteps()
         if self._configuration == CONFIG_DEBUG:
           # Debug-mode testers run all steps, but release-mode testers don't.
           self.PerfSteps()
       elif role == builder_name_schema.BUILDER_ROLE_PERF:
         # Perf-only builder.
         if not self._perf_output_basedir:
           raise ValueError(
               'BuildPerfOnly requires perf_output_basedir to be defined.')
         if self._configuration != CONFIG_RELEASE:
           raise ValueError('BuildPerfOnly should run in %s configuration.' %
                            CONFIG_RELEASE)
         self.PerfSteps()
     self.Validate()
     return self