Changed the CheckBaseMacrosInHeaders presubmit to pass over C++ comments

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 depot_tools.
 """
 
@@ skipping 1485 matching lines @@
                   (r"^base[\\\/]memory[\\\/]singleton\.h$",))
     return input_api.FilterSourceFile(affected_file, black_list=black_list)
 
   pattern = input_api.re.compile(r'(?<!class\sbase::)Singleton\s*<')
   files = []
   for f in input_api.AffectedSourceFiles(FileFilter):
     if (f.LocalPath().endswith('.h') or f.LocalPath().endswith('.hxx') or
         f.LocalPath().endswith('.hpp') or f.LocalPath().endswith('.inl')):
       contents = input_api.ReadFile(f)
       for line in contents.splitlines(False):
         if (not input_api.re.match(r'//', line) and # Strip C++ comment.

[Dan Beam, 2015/10/19 22:19:36]

this doesn't work that well, IMO, unless I'm missing some magic stripping
somewhere (also, striplines() doesn't strip extra \s, just \n or \r\n, afaik)

$ python
<_sre.SRE_Match object at 0x7f90a5ad7ac0>

             pattern.search(line)):
           files.append(f)
           break
 
   if files:
     return [ output_api.PresubmitError(
         'Found base::Singleton<T> in the following header files.\n' +
         'Please move them to an appropriate source file so that the ' +
         'template gets instantiated in a single compilation unit.',
         files) ]
   return []
 
 
 def _CheckBaseMacrosInHeaders(input_api, output_api):
   """Check for base/macros.h if DISALLOW_* macro is used."""
 
   disallows = ('DISALLOW_ASSIGN', 'DISALLOW_COPY', 'DISALLOW_EVIL')
   macros = '#include "base/macros.h"'
   basictypes = '#include "base/basictypes.h"'
 
   files = []
   for f in input_api.AffectedSourceFiles(None):
     if not f.LocalPath().endswith('.h'):
       continue
     for line_num, line in f.ChangedContents():
+      if input_api.re.match(r'//', line): # Strip C++ comment.

[Dan Beam, 2015/10/19 22:19:36]

this would only match lines that start with "//" and no spaces (I'm pretty
sure).  that's why I didn't port it from the other check.  alternatives:

  if input_api.re.search(r'//', line):  # Strip C++ comment.

(match -> search) OR

  if line.lstrip().startswith('//'):  # Strip C++ comment.

(also note: \s\s# instead of \s#)

personally prefer second line

also maybe update the other check?

[oystein (OOO til 10th of July), 2015/10/20 00:04:05]

Good catch; I just blindly copied the check from the other test. Done.

+        continue
       if any(d in line for d in disallows):
         contents = input_api.ReadFile(f)
         if not (macros in contents or basictypes in contents):
           files.append(f)
           break
 
   msg = ('The following files appear to be using DISALLOW_* macros.\n'
          'Please #include "base/macros.h" in them.')
   return [output_api.PresubmitError(msg, files)] if files else []
 
@@ skipping 432 matching lines @@
   for master in masters:
     try_config.setdefault(master, {})
     for builder in masters[master]:
       # Do not trigger presubmit builders, since they're likely to fail
       # (e.g. OWNERS checks before finished code review), and we're
       # running local presubmit anyway.
       if 'presubmit' not in builder:
         try_config[master][builder] = ['defaulttests']
 
   return try_config