Fix include order PRESUBMIT check: #if-#elif-#else

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 541 matching lines @@
     if line_num in changed_linenums or previous_line_num in changed_linenums:
       warnings.append('    %s:%d' % (file_path, line_num))
   return warnings
 
 
 def _CheckIncludeOrderInFile(input_api, f, is_source, changed_linenums):
   """Checks the #include order for the given file f."""
 
   system_include_pattern = input_api.re.compile(r'\s*#include \<.*')
   custom_include_pattern = input_api.re.compile(r'\s*#include "(?P<FILE>.*)"')
-  if_pattern = input_api.re.compile(r'\s*#if.*')
-  endif_pattern = input_api.re.compile(r'\s*#endif.*')
+  if_pattern = input_api.re.compile(r'\s*#\s*(if|elif|else|endif).*')
 
   contents = f.NewContents()
   warnings = []
   line_num = 0
 
   # Handle the special first include for source files. If the header file is
   # some/path/file.h, the corresponding source file can be some/path/file.cc,
   # some/other/path/file.cc, some/path/file_platform.cc etc. It's also possible
   # that no special first include exists.
   if is_source:
@@ skipping 13 matching lines @@
           # No special first include -> process the line again along with normal
           # includes.
           line_num -= 1
         break
 
   # Split into scopes: Each region between #if and #endif is its own scope.
   scopes = []
   current_scope = []
   for line in contents[line_num:]:
     line_num += 1
-    if if_pattern.match(line) or endif_pattern.match(line):
+    if if_pattern.match(line):
       scopes.append(current_scope)
       current_scope = []
     elif (system_include_pattern.match(line) or
           custom_include_pattern.match(line)):
       current_scope.append((line_num, line))
   scopes.append(current_scope)
 
   for scope in scopes:
     warnings.extend(_CheckIncludeOrderForScope(scope, input_api, f.LocalPath(),
                                                changed_linenums))
@@ skipping 39 matching lines @@
   results.extend(_CheckNoIOStreamInHeaders(input_api, output_api))
   results.extend(_CheckNoUNIT_TESTInSourceFiles(input_api, output_api))
   results.extend(_CheckNoNewWStrings(input_api, output_api))
   results.extend(_CheckNoDEPSGIT(input_api, output_api))
   results.extend(_CheckNoBannedFunctions(input_api, output_api))
   results.extend(_CheckNoPragmaOnce(input_api, output_api))
   results.extend(_CheckNoTrinaryTrueFalse(input_api, output_api))
   results.extend(_CheckUnwantedDependencies(input_api, output_api))
   results.extend(_CheckFilePermissions(input_api, output_api))
   results.extend(_CheckNoAuraWindowPropertyHInHeaders(input_api, output_api))
-  # Causes a problem with content/renderer/render_view_impl.cc
-  #results.extend(_CheckIncludeOrder(input_api, output_api))
+  results.extend(_CheckIncludeOrder(input_api, output_api))
 
   if any('PRESUBMIT.py' == f.LocalPath() for f in input_api.AffectedFiles()):
     results.extend(input_api.canned_checks.RunUnitTestsInDirectory(
         input_api, output_api,
         input_api.PresubmitLocalPath(),
         whitelist=[r'.+_test\.py$']))
   return results
 
 
 def _CheckSubversionConfig(input_api, output_api):
@@ skipping 133 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_clang:compile', 'win_aura',
                 'linux_chromeos_asan']
   elif any(re.search('[/_]chromeos', f) for f in files):
     trybots += ['linux_chromeos_clang:compile', 'linux_chromeos_asan']
 
   return trybots