Remove the Singleton<T> presubmit check from presubmit_canned_checks.py

presubmit_canned_checks.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.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 import os as _os
 _HERE = _os.path.dirname(_os.path.abspath(__file__))
 
 # Justifications for each filter:
@@ skipping 952 matching lines @@
     if input_api.is_committing:
       res_type = output_api.PresubmitPromptWarning
     else:
       res_type = output_api.PresubmitNotifyResult
     return [ res_type('|const NSClass*| is wrong, see ' +
                       'http://dev.chromium.org/developers/clang-mac',
                       files) ]
   return []
 
 
 def CheckSingletonInHeaders(input_api, output_api, source_file_filter=None):

[M-A Ruel, 2015/02/13 17:04:18]

I wonder why this check is in presubmit_canned_checks at all. It's highly
chromium src.git specific.

   """Checks to make sure no header files have |Singleton<|."""
   pattern = input_api.re.compile(r'(?<!class\s)Singleton\s*<')
   files = []
   for f in input_api.AffectedSourceFiles(source_file_filter):
     if (f.LocalPath().endswith('.h') or f.LocalPath().endswith('.hxx') or
         f.LocalPath().endswith('.hpp') or f.LocalPath().endswith('.inl')):
+      # It's ok for base/memory/singleton.h to have |Singleton<|.
+      singleton_h_path = input_api.os_path.join(
+          'base', 'memory', 'singleton.h')

[M-A Ruel, 2015/02/13 17:04:17]

You can't hardcode src.git paths here.

+      if f.LocalPath().endswith(singleton_h_path):
+        break
       contents = input_api.ReadFile(f)
       for line in contents.splitlines(False):
         if (not input_api.re.match(r'//', line) and # Strip C++ comment.
             pattern.search(line)):
           files.append(f)
           break
 
   if files:
     return [ output_api.PresubmitError(
         'Found Singleton<T> in the following header files.\n' +
@@ skipping 144 matching lines @@
   for f in affected_files:
     cmd = ['gn', 'format', '--dry-run', f.AbsoluteLocalPath()]
     rc = gn.main(cmd)
     if rc == 2:
       warnings.append(output_api.PresubmitPromptWarning(
           '%s requires formatting. Please run `gn format --in-place %s`.' % (
               f.AbsoluteLocalPath(), f.LocalPath())))
   # It's just a warning, so ignore other types of failures assuming they'll be
   # caught elsewhere.
   return warnings