More sync of PRESUBMIT with what CQ runs

PRESUBMIT.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.
 
 """Top-level presubmit script for Chromium.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 1305 matching lines @@
           'telemetry_unittests',
       ],
       'mac_chromium_compile_dbg': ['defaulttests'],
       'mac_chromium_rel': ['defaulttests'],
       'mac_nacl_sdk_build': ['compile'],
       'mac_rel': [
           'telemetry_perf_unittests',
           'telemetry_unittests',
       ],
       'win': ['compile'],
+      'win_chromium_compile_dbg': ['defaulttests'],
       'win_nacl_sdk_build': ['compile'],
       'win_rel': standard_tests + [
           'app_list_unittests',
           'ash_unittests',
           'aura_unittests',
           'cc_unittests',
           'chrome_elf_unittests',
           'chromedriver_unittests',
           'components_unittests',
           'compositor_unittests',
@@ skipping 69 matching lines @@
 def GetPreferredTryMasters(project, change):
   files = change.LocalPaths()
 
   if not files or all(re.search(r'[\\/]OWNERS$', f) for f in files):
     return {}
 
   if all(re.search('\.(m|mm)$|(^|[/_])mac[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'mac_chromium_compile_dbg',
         'mac_chromium_rel',
-        'mac_rel'
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
     return GetDefaultTryConfigs(['win', 'win_rel'])
   if all(re.search('(^|[/_])android[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'android_aosp',
         'android_clang_dbg',
         'android_dbg',
     ])
   if all(re.search('[/_]ios[/_.]', f) for f in files):
     return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
 
   builders = [
       'android_clang_dbg',
       'android_dbg',
       'ios_dbg_simulator',
       'ios_rel_device',
-      'linux_gtk',
-      'linux_asan',
       'linux_chromium_chromeos_rel',
       'linux_chromium_clang_dbg',
-      'linux_nacl_sdk_build',
       'linux_chromium_rel',
-      'linux_rel',
       'mac_chromium_compile_dbg',
-      'mac_nacl_sdk_build',
       'mac_chromium_rel',
-      'mac_rel',
-      'win',
-      'win_nacl_sdk_build',
+      'win_chromium_compile_dbg',
       'win_rel',
       'win_x64_rel',
   ]
 
   # Match things like path/aura/file.cc and path/file_aura.cc.
   # Same for chromeos.
   if any(re.search('[/_](aura|chromeos)', f) for f in files):
     builders.extend([
         'linux_chromeos_asan',
         'linux_chromium_chromeos_clang_dbg'
     ])
 
   # If there are gyp changes to base, build, or chromeos, run a full cros build
   # in addition to the shorter linux_chromeos build. Changes to high level gyp
   # files have a much higher chance of breaking the cros build, which is
   # differnt from the linux_chromeos build that most chrome developers test
   # with.
   if any(re.search('^(base|build|chromeos).*\.gypi?$', f) for f in files):
     builders.extend(['cros_x86'])
 
   # The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
   # unless they're .gyp(i) files as changes to those files can break the gyp
   # step on that bot.
   if (not all(re.search('^chrome', f) for f in files) or
       any(re.search('\.gypi?$', f) for f in files)):
     builders.extend(['android_aosp'])
 
   return GetDefaultTryConfigs(builders)