Ignore hardcoded URLs and ForTest(ing)/for_test(ing) in 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 gcl.
 """
 
@@ skipping 213 matching lines @@
   that ignores header files and may have some false positives. A
   better implementation would probably need a proper C++ parser.
   """
   # We only scan .cc files and the like, as the declaration of
   # for-testing functions in header files are hard to distinguish from
   # calls to such functions without a proper C++ parser.
   file_inclusion_pattern = r'.+%s' % _IMPLEMENTATION_EXTENSIONS
 
   base_function_pattern = r'ForTest(ing)?|for_test(ing)?'
   inclusion_pattern = input_api.re.compile(r'(%s)\s*\(' % base_function_pattern)
+  comment_pattern = input_api.re.compile(r'//.*%s' % base_function_pattern)
   exclusion_pattern = input_api.re.compile(
     r'::[A-Za-z0-9_]+(%s)|(%s)[^;]+\{' % (
       base_function_pattern, base_function_pattern))
 
   def FilterFile(affected_file):
     black_list = (_EXCLUDED_PATHS +
                   _TEST_CODE_EXCLUDED_PATHS +
                   input_api.DEFAULT_BLACK_LIST)
     return input_api.FilterSourceFile(
       affected_file,
       white_list=(file_inclusion_pattern, ),
       black_list=black_list)
 
   problems = []
   for f in input_api.AffectedSourceFiles(FilterFile):
     local_path = f.LocalPath()
     lines = input_api.ReadFile(f).splitlines()
     line_number = 0
     for line in lines:
       if (inclusion_pattern.search(line) and
+          not comment_pattern.search(line) and
           not exclusion_pattern.search(line)):
         problems.append(
           '%s:%d\n    %s' % (local_path, line_number, line.strip()))
       line_number += 1
 
   if problems:
     return [output_api.PresubmitPromptOrNotify(_TEST_ONLY_WARNING, problems)]
   else:
     return []
 
@@ skipping 417 matching lines @@
     top-level directories that generally speaking should not hard-code
     service URLs (e.g. src/android_webview/, src/content/ and others).
     """
     return input_api.FilterSourceFile(
       affected_file,
       white_list=(r'^(android_webview|base|content|net)[\\\/].*', ),
       black_list=(_EXCLUDED_PATHS +
                   _TEST_CODE_EXCLUDED_PATHS +
                   input_api.DEFAULT_BLACK_LIST))
 
-  pattern = input_api.re.compile('"[^"]*google\.com[^"]*"')
+  base_pattern = '"[^"]*google\.com[^"]*"'
+  comment_pattern = input_api.re.compile('//.*%s' % base_pattern)
+  pattern = input_api.re.compile(base_pattern)
   problems = []  # items are (filename, line_number, line)
   for f in input_api.AffectedSourceFiles(FilterFile):
     for line_num, line in f.ChangedContents():
-      if pattern.search(line):
+      if not comment_pattern.search(line) and pattern.search(line):
         problems.append((f.LocalPath(), line_num, line))
 
   if problems:
     return [output_api.PresubmitPromptOrNotify(
         'Most layers below src/chrome/ should not hardcode service URLs.\n'
         'Are you sure this is correct? (Contact: joi@chromium.org)',
         ['  %s:%d:  %s' % (
             problem[0], problem[1], problem[2]) for problem in problems])]
   else:
     return []
@@ skipping 61 matching lines @@
     output = output_api.PresubmitNotifyResult
 
   owners_db = input_api.owners_db
   owner_email, reviewers = input_api.canned_checks._RietveldOwnerAndReviewers(
       input_api,
       owners_db.email_regexp,
       approval_needed=input_api.is_committing)
 
   owner_email = owner_email or input_api.change.author_email
 
-  reviewers_plus_owner = reviewers
+  reviewers_plus_owner = set(reviewers)
   if owner_email:
-    reviewers_plus_owner = set([owner_email]).union(reviewers)
+    reviewers_plus_owner.add(owner_email)
   missing_files = owners_db.files_not_covered_by(virtual_depended_on_files,
                                                  reviewers_plus_owner)
   unapproved_dependencies = ["'+%s'," % path[:-len('/DEPS')]
                              for path in missing_files]
 
   if unapproved_dependencies:
     output_list = [
       output('Missing LGTM from OWNERS of directories added to DEPS:\n    %s' %
              '\n    '.join(sorted(unapproved_dependencies)))]
     if not input_api.is_committing:
@@ skipping 237 matching lines @@
       'win_rel',
       'win:compile',
   ]
 
   # Match things like path/aura/file.cc and path/file_aura.cc.
   # Same for chromeos.
   if any(re.search('[/_](aura|chromeos)', f) for f in files):
     trybots += ['linux_chromeos_clang:compile', 'linux_chromeos_asan']
 
   return trybots