Sync up PRESUBMIT.py with Chromium CQ config.

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 1582 matching lines @@
       # incremental build. Reference:
       # http://chromium.org/developers/tree-sheriffs/perf-sheriffs.
       # TODO(maruel): An option would be to run 'sizes' but not count a failure
       # of this step as a try job failure.
       'android_aosp': ['compile'],
       'android_arm64_dbg_recipe': ['slave_steps'],
       'android_chromium_gn_compile_dbg': ['compile'],
       'android_chromium_gn_compile_rel': ['compile'],
       'android_clang_dbg_recipe': ['slave_steps'],
       'android_dbg_tests_recipe': ['slave_steps'],
-      'cros_x86': ['defaulttests'],
       'ios_dbg_simulator': [
           'compile',
           'base_unittests',
           'content_unittests',
           'crypto_unittests',
           'url_unittests',
           'net_unittests',
           'sql_unittests',
           'ui_base_unittests',
       ],
       'ios_rel_device': ['compile'],
       'ios_rel_device_ninja': ['compile'],
       'mac_asan': ['compile'],
       #TODO(stip): Change the name of this builder to reflect that it's release.
       'linux_gtk': standard_tests,
       'linux_chromeos_asan': ['compile'],
+      'linux_chromium_asan_rel': ['defaulttests'],
       'linux_chromium_chromeos_clang_dbg': ['defaulttests'],
+      'linux_chromium_chromeos_compile_dbg_ng': ['defaulttests'],
       'linux_chromium_chromeos_rel': ['defaulttests'],
+      'linux_chromium_chromeos_rel_ng': ['defaulttests'],
       'linux_chromium_compile_dbg': ['defaulttests'],
+      'linux_chromium_compile_dbg_32_ng': ['compile'],
       'linux_chromium_gn_dbg': ['compile'],
       'linux_chromium_gn_rel': ['defaulttests'],
       'linux_chromium_rel': ['defaulttests'],
       'linux_chromium_rel_ng': ['defaulttests'],
       'linux_chromium_clang_dbg': ['defaulttests'],
       'linux_gpu': ['defaulttests'],
       'linux_nacl_sdk_build': ['compile'],
       'mac_chromium_compile_dbg': ['defaulttests'],
+      'mac_chromium_compile_dbg_ng': ['defaulttests'],
       'mac_chromium_rel': ['defaulttests'],
       'mac_chromium_rel_ng': ['defaulttests'],
       'mac_gpu': ['defaulttests'],
       'mac_nacl_sdk_build': ['compile'],
       'win_chromium_compile_dbg': ['defaulttests'],
       'win_chromium_dbg': ['defaulttests'],
       'win_chromium_rel': ['defaulttests'],
       'win_chromium_rel_ng': ['defaulttests'],
       'win_chromium_x64_rel': ['defaulttests'],
       'win_chromium_x64_rel_ng': ['defaulttests'],
@@ skipping 38 matching lines @@
 
 def GetPreferredTryMasters(project, change):
   import re
   files = change.LocalPaths()
 
   if not files or all(re.search(r'[\\\/]OWNERS$', f) for f in files):
     return {}
 
   if all(re.search(r'\.(m|mm)$|(^|[\\\/_])mac[\\\/_.]', f) for f in files):
     return GetDefaultTryConfigs([
-        'mac_chromium_compile_dbg',
+        'mac_chromium_compile_dbg_ng',
         'mac_chromium_rel_ng',
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'win_chromium_dbg',
         'win_chromium_rel',
         'win8_chromium_rel',
     ])
   if all(re.search(r'(^|[\\\/_])android[\\\/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'android_aosp',
         'android_dbg_tests_recipe',
     ])
   if all(re.search(r'[\\\/_]ios[\\\/_.]', f) for f in files):
     return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
 
   builders = [
+      'android_aosp',
       'android_arm64_dbg_recipe',
       'android_chromium_gn_compile_rel',
       'android_chromium_gn_compile_dbg',
       'android_clang_dbg_recipe',
       'android_dbg_tests_recipe',
       'ios_dbg_simulator',
       'ios_rel_device',
       'ios_rel_device_ninja',
-      'linux_chromium_chromeos_rel',
+      'linux_chromium_asan_rel',
+      'linux_chromium_chromeos_compile_dbg_ng',
+      'linux_chromium_chromeos_rel_ng',
+      'linux_chromium_compile_dbg_32_ng',
       'linux_chromium_gn_dbg',
       'linux_chromium_gn_rel',
       'linux_chromium_rel_ng',
       'linux_gpu',
-      'mac_chromium_compile_dbg',
+      'mac_chromium_compile_dbg_ng',
       'mac_chromium_rel_ng',
       'mac_gpu',
       'win_chromium_compile_dbg',
       'win_chromium_rel',
       'win_chromium_x64_rel',
       'win_gpu',
       'win8_chromium_rel',
   ]
 
   # Match things like path/aura/file.cc and path/file_aura.cc.
   # Same for chromeos.
   if any(re.search(r'[\\\/_](aura|chromeos)', f) for f in files):
     builders.extend([
         'linux_chromeos_asan',
     ])
 
-  # 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)