Changed the CheckBaseMacrosInHeaders presubmit to pass over C++ comments

PRESUBMIT_test.py

 #!/usr/bin/env python
 # 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.
 
 import glob
 import json
 import os
 import re
 import subprocess
@@ skipping 374 matching lines @@
     results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
     self.assertEqual(0, len(results))
 
 
 class CheckSingletonInHeadersTest(unittest.TestCase):
   def testSingletonInArbitraryHeader(self):
     diff_singleton_h = ['base::subtle::AtomicWord '
                         'base::Singleton<Type, Traits, DifferentiatingType>::']
     diff_foo_h = ['// base::Singleton<Foo> in comment.',
                   'friend class base::Singleton<Foo>']
+    diff_foo2_h = ['  //Foo* bar = base::Singleton<Foo>::get();']
     diff_bad_h = ['Foo* foo = base::Singleton<Foo>::get();']
     mock_input_api = MockInputApi()
     mock_input_api.files = [MockAffectedFile('base/memory/singleton.h',
                                      diff_singleton_h),
                             MockAffectedFile('foo.h', diff_foo_h),
+                            MockAffectedFile('foo2.h', diff_foo2_h),
                             MockAffectedFile('bad.h', diff_bad_h)]
     warnings = PRESUBMIT._CheckSingletonInHeaders(mock_input_api,
                                                   MockOutputApi())
     self.assertEqual(1, len(warnings))
+    self.assertEqual(2, len(warnings[0].items))
     self.assertEqual('error', warnings[0].type)
     self.assertTrue('Found base::Singleton<T>' in warnings[0].message)
 
   def testSingletonInCC(self):
     diff_cc = ['Foo* foo = base::Singleton<Foo>::get();']
     mock_input_api = MockInputApi()
     mock_input_api.files = [MockAffectedFile('some/path/foo.cc', diff_cc)]
     warnings = PRESUBMIT._CheckSingletonInHeaders(mock_input_api,
                                                   MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 class CheckBaseMacrosInHeadersTest(unittest.TestCase):
-  def _make_h(self, macro, header):
+  def _make_h(self, macro, header, line_prefix=''):
     return ("""
 #include "base/%s.h"
 
 class Thing {
  private:
-  DISALLOW_%s(Thing);
+%sDISALLOW_%s(Thing);
 };
-""" % (macro, header)).splitlines()
+""" % (macro, line_prefix, header)).splitlines()
 
   def testBaseMacrosInHeadersBad(self):
     mock_input_api = MockInputApi()
     mock_input_api.files = [
       MockAffectedFile('foo.h', self._make_h('not_macros', 'ASSIGN')),
       MockAffectedFile('bar.h', self._make_h('not_macros', 'COPY')),
       MockAffectedFile('baz.h', self._make_h('not_macros', 'COPY_AND_ASSIGN')),
       MockAffectedFile('qux.h', self._make_h('not_macros', 'EVIL')),
     ]
     warnings = PRESUBMIT._CheckBaseMacrosInHeaders(mock_input_api,
                                                    MockOutputApi())
     self.assertEqual(1, len(warnings))
     self.assertEqual(4, len(warnings[0].items))
 
   def testBaseMacrosInHeadersGood(self):
     mock_input_api = MockInputApi()
     mock_input_api.files = [
       MockAffectedFile('foo.h', self._make_h('macros', 'ASSIGN')),
       MockAffectedFile('bar.h', self._make_h('macros', 'COPY')),
       MockAffectedFile('baz.h', self._make_h('macros', 'COPY_AND_ASSIGN')),
       MockAffectedFile('qux.h', self._make_h('macros', 'EVIL')),
+      MockAffectedFile('foz.h', self._make_h('not_macros', 'ASSIGN', '//')),
+      MockAffectedFile('foz.h', self._make_h('not_macros', 'ASSIGN', '  //')),
     ]
     warnings = PRESUBMIT._CheckBaseMacrosInHeaders(mock_input_api,
                                                    MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 class InvalidOSMacroNamesTest(unittest.TestCase):
   def testInvalidOSMacroNames(self):
     lines = ['#if defined(OS_WINDOWS)',
              ' #elif defined(OS_WINDOW)',
@@ skipping 520 matching lines @@
     # Tag must not contain
     nb = len(msgs[4].items)
     self.assertEqual(2, nb,
                      'Expected %d items, found %d: %s' % (2, nb, msgs[4].items))
     self.assertTrue('HasDottedTag.java' in msgs[4].items)
     self.assertTrue('HasOldTag.java' in msgs[4].items)
 
 
 if __name__ == '__main__':
   unittest.main()