Don't block CQ usage when includes that violate temporarily-allowed

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 410 matching lines @@
       error_descriptions.append(description_with_path)
     else:
       warning_descriptions.append(description_with_path)
 
   results = []
   if error_descriptions:
     results.append(output_api.PresubmitError(
         'You added one or more #includes that violate checkdeps rules.',
         error_descriptions))
   if warning_descriptions:
-    results.append(output_api.PresubmitPromptWarning(
+    if not input_api.is_committing:
+      warning_factory = output_api.PresubmitPromptWarning
+    else:
+      # We don't want to block use of the CQ when there is a warning
+      # of this kind, so we only show a message when committing.
+      warning_factory = output_api.PresubmitNotifyResult
+    results.append(warning_factory(
         'You added one or more #includes of files that are temporarily\n'
         'allowed but being removed. Can you avoid introducing the\n'
         '#include? See relevant DEPS file(s) for details and contacts.',
         warning_descriptions))
   return results
 
 
 def _CheckFilePermissions(input_api, output_api):
   """Check that all files have their permissions properly set."""
   args = [sys.executable, 'tools/checkperms/checkperms.py', '--root',
@@ skipping 151 matching lines @@
 
   # Match things like path/aura/file.cc and path/file_aura.cc.
   # Same for ash and chromeos.
   if any(re.search('[/_](ash|aura)', f) for f in files):
     trybots += ['linux_chromeos', 'linux_chromeos_clang:compile', 'win_aura']
   else:
     if any(re.search('[/_]chromeos', f) for f in files):
       trybots += ['linux_chromeos', 'linux_chromeos_clang:compile']
 
   return trybots