Use inclusive parameter names in PRESUBMIT.py

Bug: 1098562
Change-Id: I10e83b99a480d2d96b911e26b09e8db5d34a082e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333301
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795088}

PRESUBMIT_test_mocks.py

@@ -61,8 +61,6 @@ class MockInputApi(object):
   """
 
   DEFAULT_FILES_TO_SKIP = ()
-  # TODO(https://crbug.com/1098562): Remove once no longer used)
-  DEFAULT_BLACK_LIST = ()
 
   def __init__(self):
     self.canned_checks = MockCannedChecks()
@@ -95,11 +93,7 @@ class MockInputApi(object):
     return self.AffectedFiles(file_filter=file_filter)
 
   def FilterSourceFile(self, file,
-                       files_to_check=(), files_to_skip=(),
-                       # TODO(https://crbug.com/1098562): Remove once no longer used
-                       white_list=(), black_list=()):
-    files_to_check = files_to_check or white_list
-    files_to_skip = files_to_skip or black_list
+                       files_to_check=(), files_to_skip=()):
     local_path = file.LocalPath()
     found_in_files_to_check = not files_to_check
     if files_to_check:

base/PRESUBMIT.py

@@ -43,10 +43,10 @@ def _CheckNoTraceEventInclude(input_api, output_api):
     r'^#include "base/trace_event/(?!base_tracing\.h)',
   ]
 
-  white_list = [
+  files_to_check = [
     r".*\.(h|cc|mm)$",
   ]
-  black_list = [
+  files_to_skip = [
     r".*[\\/]test[\\/].*",
     r".*[\\/]trace_event[\\/].*",
     r".*[\\/]tracing[\\/].*",
@@ -56,8 +56,8 @@ def _CheckNoTraceEventInclude(input_api, output_api):
   def FilterFile(affected_file):
     return input_api.FilterSourceFile(
       affected_file,
-      white_list=white_list,
-      black_list=black_list)
+      files_to_check=files_to_check,
+      files_to_skip=files_to_skip)
 
   locations = []
   for f in input_api.AffectedSourceFiles(FilterFile):

build/util/PRESUBMIT.py

@@ -7,7 +7,7 @@ import re
 
 
 def _GetBlacklist(input_api):
-  blacklist = []
+  files_to_skip = []
   affected_files = input_api.change.AffectedFiles()
   version_script_change = next(
       (f for f in affected_files
@@ -15,7 +15,7 @@ def _GetBlacklist(input_api):
       None)
 
   if version_script_change is None:
-    blacklist.append('version_test\\.py$')
+    files_to_skip.append('version_test\\.py$')
 
   android_chrome_version_script_change = next(
       (f for f in affected_files if re.search(
@@ -23,21 +23,21 @@ def _GetBlacklist(input_api):
           '\\/android_chrome_version_test\\.py$', f.LocalPath())), None)
 
   if android_chrome_version_script_change is None:
-    blacklist.append('android_chrome_version_test\\.py$')
+    files_to_skip.append('android_chrome_version_test\\.py$')
 
-  return blacklist
+  return files_to_skip
 
 
 def _GetPythonUnitTests(input_api, output_api):
   # No need to test if files are unchanged
-  blacklist = _GetBlacklist(input_api)
+  files_to_skip = _GetBlacklist(input_api)
 
   return input_api.canned_checks.GetUnitTestsRecursively(
       input_api,
       output_api,
       input_api.PresubmitLocalPath(),
-      whitelist=['.*_test\\.py$'],
-      blacklist=blacklist)
+      files_to_check=['.*_test\\.py$'],
+      files_to_skip=files_to_skip)
 
 
 def CommonChecks(input_api, output_api):

cc/PRESUBMIT.py

@@ -21,7 +21,8 @@ def CheckChangeLintsClean(input_api, output_api):
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, source_filter, lint_filters=[], verbose_level=1)
 
-def CheckAsserts(input_api, output_api, allowlist=CC_SOURCE_FILES, denylist=None):
+def CheckAsserts(input_api, output_api, allowlist=CC_SOURCE_FILES,
+                 denylist=None):
   denylist = tuple(denylist or input_api.DEFAULT_FILES_TO_SKIP)
   source_file_filter = lambda x: input_api.FilterSourceFile(x, allowlist,
       denylist)

chrome/PRESUBMIT.py

@@ -36,9 +36,9 @@ EXCLUDE = (
 
 def _CheckChangeLintsClean(input_api, output_api):
   """Makes sure that the chrome/ code is cpplint clean."""
-  black_list = input_api.DEFAULT_BLACK_LIST + EXCLUDE
+  files_to_skip = input_api.DEFAULT_FILES_TO_SKIP + EXCLUDE
   sources = lambda x: input_api.FilterSourceFile(
-    x, white_list=INCLUDE_CPP_FILES_ONLY, black_list=black_list)
+    x, files_to_check=INCLUDE_CPP_FILES_ONLY, files_to_skip=files_to_skip)
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, sources)
 
@@ -80,7 +80,7 @@ def _CheckNoOSIOSMacrosInChrome(input_api, output_api):
   ios_macros = []
   def SourceFilter(affected_file):
     return input_api.FilterSourceFile(affected_file, INCLUDE_SOURCE_FILES_ONLY,
-                                      input_api.DEFAULT_BLACK_LIST)
+                                      input_api.DEFAULT_FILES_TO_SKIP)
   for f in input_api.AffectedSourceFiles(SourceFilter):
     ios_macros.extend(_CheckNoOSIOSMacrosInChromeFile(input_api, f))
 

chrome/android/java/src/PRESUBMIT.py

@@ -52,8 +52,7 @@ def _CommonChecks(input_api, output_api):
 
 
 def _CheckNotificationConstructors(input_api, output_api):
-  # "Blacklist" because the following files are excluded from the check.
-  blacklist = (
+  files_to_skip = (
       'chrome/android/java/src/org/chromium/chrome/browser/notifications/'
       'ChromeNotificationWrapperBuilder.java',
       'chrome/android/java/src/org/chromium/chrome/browser/notifications/'
@@ -70,14 +69,13 @@ def _CheckNotificationConstructors(input_api, output_api):
 
   See https://crbug.com/678670 for more information.
   '''
-  return _CheckReIgnoreComment(input_api, output_api, error_msg, blacklist,
+  return _CheckReIgnoreComment(input_api, output_api, error_msg, files_to_skip,
                                NEW_NOTIFICATION_BUILDER_RE)
 
 
 def _CheckAlertDialogBuilder(input_api, output_api):
-  # "Blacklist" because the following files are excluded from the check. In
-  # general, preference and FRE related UIs are not relevant to VR mode.
-  blacklist = (
+  # In general, preference and FRE related UIs are not relevant to VR mode.
+  files_to_skip = (
       BROWSER_ROOT + 'browserservices/ClearDataDialogActivity.java',
       BROWSER_ROOT + 'browsing_data/ConfirmImportantSitesDialogFragment.java',
       BROWSER_ROOT + 'browsing_data/OtherFormsOfHistoryDialogFragment.java',
@@ -117,7 +115,7 @@ def _CheckAlertDialogBuilder(input_api, output_api):
   //src/chrome/android/java/src/org/chromium/chrome/browser/vr/VR_JAVA_OWNERS
   '''
   error_files = []
-  result = _CheckReIgnoreComment(input_api, output_api, error_msg, blacklist,
+  result = _CheckReIgnoreComment(input_api, output_api, error_msg, files_to_skip,
                                  NEW_ALERTDIALOG_BUILDER_RE, error_files)
 
   wrong_builder_errors = []
@@ -142,8 +140,7 @@ def _CheckAlertDialogBuilder(input_api, output_api):
 
 
 def _CheckCompatibleAlertDialogBuilder(input_api, output_api):
-  # "Blacklist" because the following files are excluded from the check.
-  blacklist = (
+  files_to_skip = (
       BROWSER_ROOT + 'autofill/AutofillPopupBridge.java',
       BROWSER_ROOT + 'autofill/keyboard_accessory/'
                      'AutofillKeyboardAccessoryBridge.java',
@@ -171,11 +168,11 @@ def _CheckCompatibleAlertDialogBuilder(input_api, output_api):
   If you are in doubt, contact
   //src/chrome/android/java/src/org/chromium/chrome/browser/vr/VR_JAVA_OWNERS
   '''
-  return _CheckReIgnoreComment(input_api, output_api, error_msg, blacklist,
+  return _CheckReIgnoreComment(input_api, output_api, error_msg, files_to_skip,
                                NEW_COMPATIBLE_ALERTDIALOG_BUILDER_RE)
 
 
-def _CheckReIgnoreComment(input_api, output_api, error_msg, blacklist,
+def _CheckReIgnoreComment(input_api, output_api, error_msg, files_to_skip,
                           regular_expression, error_files=None):
 
   def CheckLine(current_file, line_number, line, problems, error_files):
@@ -191,7 +188,7 @@ def _CheckReIgnoreComment(input_api, output_api, error_msg, blacklist,
 
   problems = []
   sources = lambda x: input_api.FilterSourceFile(
-      x, white_list=(r'.*\.java$',), black_list=blacklist)
+      x, files_to_check=(r'.*\.java$',), files_to_skip=files_to_skip)
   for f in input_api.AffectedFiles(include_deletes=False,
                                    file_filter=sources):
     previous_line = ''

components/browser_sync/PRESUBMIT.py

@@ -14,7 +14,7 @@ BROWSER_SYNC_SOURCE_FILES = (r'^components[\\/]browser_sync[\\/].*\.(cc|h)$',)
 
 def CheckChangeLintsClean(input_api, output_api):
   source_filter = lambda x: input_api.FilterSourceFile(
-    x, white_list=BROWSER_SYNC_SOURCE_FILES, black_list=None)
+    x, files_to_check=BROWSER_SYNC_SOURCE_FILES, files_to_skip=None)
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, source_filter, lint_filters=[], verbose_level=1)
 

components/cronet/PRESUBMIT.py

@@ -49,7 +49,7 @@ def _PackageChecks(input_api, output_api):
   impl_package_pattern = input_api.re.compile(r'^package org.chromium.net;')
 
   source_filter = lambda path: input_api.FilterSourceFile(path,
-      white_list=[r'^components/cronet/android/.*\.(java|template)$'])
+      files_to_check=[r'^components/cronet/android/.*\.(java|template)$'])
 
   problems = []
   for f in input_api.AffectedSourceFiles(source_filter):

components/sync/PRESUBMIT.py

@@ -370,7 +370,7 @@ def FieldNumberToPrototypeString(field_number):
 
 def CheckChangeLintsClean(input_api, output_api):
   source_filter = lambda x: input_api.FilterSourceFile(
-    x, white_list=SYNC_SOURCE_FILES, black_list=None)
+    x, files_to_check=SYNC_SOURCE_FILES, files_to_skip=None)
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, source_filter, lint_filters=[], verbose_level=1)
 

components/sync_bookmarks/PRESUBMIT.py

@@ -15,7 +15,7 @@ SYNC_BOOKMARKS_SOURCE_FILES = (
 
 def CheckChangeLintsClean(input_api, output_api):
   source_filter = lambda x: input_api.FilterSourceFile(
-    x, white_list=SYNC_BOOKMARKS_SOURCE_FILES, black_list=None)
+    x, files_to_check=SYNC_BOOKMARKS_SOURCE_FILES, files_to_skip=None)
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, source_filter, lint_filters=[], verbose_level=1)
 

components/sync_sessions/PRESUBMIT.py

@@ -14,7 +14,7 @@ SYNC_SESSIONS_SOURCE_FILES = (r'^components[\\/]sync_sessions[\\/].*\.(cc|h)$',)
 
 def CheckChangeLintsClean(input_api, output_api):
   source_filter = lambda x: input_api.FilterSourceFile(
-    x, white_list=SYNC_SESSIONS_SOURCE_FILES, black_list=None)
+    x, files_to_check=SYNC_SESSIONS_SOURCE_FILES, files_to_skip=None)
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, source_filter, lint_filters=[], verbose_level=1)
 

third_party/android_platform/development/scripts/PRESUBMIT.py

@@ -16,8 +16,8 @@ def CommonChecks(input_api, output_api):
       input_api,
       output_api,
       input_api.PresubmitLocalPath(),
-      whitelist=[r'.+_test\.py$'],
-      blacklist=[])
+      files_to_check=[r'.+_test\.py$'],
+      files_to_skip=[])
 
   output.extend(input_api.RunTests(py_tests, False))
 

third_party/sqlite/PRESUBMIT.py

@@ -16,7 +16,7 @@ def CheckChangeOnUpload(input_api, output_api):
             input_api,
             output_api,
             input_api.os_path.join(this_dir, 'scripts'),
-            whitelist=['.*unittest.py$'],
+            files_to_check=['.*unittest.py$'],
             env=None,
             run_on_python2=False,
             run_on_python3=True))

tools/android/dependency_analysis/PRESUBMIT.py

@@ -13,8 +13,8 @@ def CommonChecks(input_api, output_api):
         input_api,
         output_api,
         input_api.PresubmitLocalPath(),
-        whitelist=[r'.+_unittest\.py$'],
-        blacklist=[],
+        files_to_check=[r'.+_unittest\.py$'],
+        files_to_skip=[],
         run_on_python2=False,
         run_on_python3=True)
 

tools/binary_size/PRESUBMIT.py

@@ -15,8 +15,8 @@ def CommonChecks(input_api, output_api):
       input_api,
       output_api,
       input_api.PresubmitLocalPath(),
-      whitelist=[r'.+_test\.py$'],
-      blacklist=[],
+      files_to_check=[r'.+_test\.py$'],
+      files_to_skip=[],
       run_on_python2=False,
       run_on_python3=True)
 

tools/infra/PRESUBMIT.py

@@ -14,10 +14,13 @@ def _CommonChecks(input_api, output_api):
   results.extend(input_api.canned_checks.RunPylint(input_api, output_api))
 
   commands = []
-  commands.extend(input_api.canned_checks.GetUnitTestsRecursively(
-      input_api, output_api,
-      input_api.os_path.join(input_api.PresubmitLocalPath()),
-      whitelist=[r'.+_unittest\.py$'], blacklist=[]))
+  commands.extend(
+      input_api.canned_checks.GetUnitTestsRecursively(
+          input_api,
+          output_api,
+          input_api.os_path.join(input_api.PresubmitLocalPath()),
+          files_to_check=[r'.+_unittest\.py$'],
+          files_to_skip=[]))
   results.extend(input_api.RunTests(commands))
 
   return results

ui/views/PRESUBMIT.py

@@ -16,8 +16,8 @@ INCLUDE_CPP_FILES_ONLY = (
 def CheckChangeLintsClean(input_api, output_api):
   """Makes sure that the change is cpplint clean."""
   sources = lambda x: input_api.FilterSourceFile(
-    x, white_list=INCLUDE_CPP_FILES_ONLY,
-    black_list=input_api.DEFAULT_BLACK_LIST)
+    x, files_to_check=INCLUDE_CPP_FILES_ONLY,
+    files_to_skip=input_api.DEFAULT_FILES_TO_SKIP)
   return input_api.canned_checks.CheckChangeLintsClean(
       input_api, output_api, sources, lint_filters=[], verbose_level=1)
 

weblayer/browser/java/org/chromium/weblayer_private/interfaces/PRESUBMIT.py

@@ -149,7 +149,7 @@ def _CompareApiDumpForFiles(input_api, output_api, aidl_files):
 
 def CheckChangeOnUpload(input_api, output_api):
   filter_lambda = lambda x: input_api.FilterSourceFile(
-      x, white_list=[r'.*\.aidl$' ])
+      x, files_to_check=[r'.*\.aidl$' ])
   aidl_files = []
   for f in input_api.AffectedFiles(include_deletes=False,
                                    file_filter=filter_lambda):