Remove redundant checks from third_party/WebKit/PRESUBMIT.py.

third_party/WebKit/PRESUBMIT.py

 # Copyright (c) 2013 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 Blink.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 21 matching lines @@
                 errors.append('    %s:%d %s' % (
                     f.LocalPath(), line_num, line))
 
     results = []
     if errors:
         results.append(output_api.PresubmitError(
             'Files that include non-Blink variant mojoms found:', errors))
     return results
 
 
-def _CheckForVersionControlConflictsInFile(input_api, f):
-    pattern = input_api.re.compile('^(?:<<<<<<<|>>>>>>>) |^=======$')
-    errors = []
-    for line_num, line in f.ChangedContents():
-        if pattern.match(line):
-            errors.append('    %s:%d %s' % (f.LocalPath(), line_num, line))
-    return errors
-
-
-def _CheckForVersionControlConflicts(input_api, output_api):
-    """Usually this is not intentional and will cause a compile failure."""
-    errors = []
-    for f in input_api.AffectedFiles():
-        errors.extend(_CheckForVersionControlConflictsInFile(input_api, f))
-
-    results = []
-    if errors:
-        results.append(output_api.PresubmitError(
-            'Version control conflict markers found, please resolve.', errors))
-    return results
-
-
 def _CheckWatchlist(input_api, output_api):
     """Check that the WATCHLIST file parses correctly."""
     errors = []
     for f in input_api.AffectedFiles():
         if f.LocalPath() != 'WATCHLISTS':
             continue
         import StringIO
         import logging
         import watchlists
 
@@ skipping 20 matching lines @@
 def _CommonChecks(input_api, output_api):
     """Checks common to both upload and commit."""
     # We should figure out what license checks we actually want to use.
     license_header = r'.*'
 
     results = []
     results.extend(input_api.canned_checks.PanProjectChecks(
         input_api, output_api, excluded_paths=_EXCLUDED_PATHS,
         maxlen=800, license_header=license_header))
     results.extend(_CheckForNonBlinkVariantMojomIncludes(input_api, output_api))
-    results.extend(_CheckForVersionControlConflicts(input_api, output_api))
-    results.extend(_CheckPatchFiles(input_api, output_api))
     results.extend(_CheckTestExpectations(input_api, output_api))
     results.extend(_CheckChromiumPlatformMacros(input_api, output_api))
     results.extend(_CheckWatchlist(input_api, output_api))
-    results.extend(_CheckFilePermissions(input_api, output_api))
     return results
 
 
-def _CheckPatchFiles(input_api, output_api):
-  problems = [f.LocalPath() for f in input_api.AffectedFiles()
-      if f.LocalPath().endswith(('.orig', '.rej'))]
-  if problems:
-    return [output_api.PresubmitError(
-        "Don't commit .rej and .orig files.", problems)]

[Nico, 2017/03/23 12:55:58]

This feels like a remnant from svn days anyhow – we might want to remove this
from the global PRESUBMIT too (?)

-  else:
-    return []
-
-
 def _CheckTestExpectations(input_api, output_api):
     local_paths = [f.LocalPath() for f in input_api.AffectedFiles()]
     if any('LayoutTests' in path for path in local_paths):
         lint_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
             'Tools', 'Scripts', 'lint-test-expectations')
         _, errs = input_api.subprocess.Popen(
             [input_api.python_executable, lint_path],
             stdout=input_api.subprocess.PIPE,
             stderr=input_api.subprocess.PIPE).communicate()
         if not errs:
@@ skipping 91 matching lines @@
 
 def _CheckForFailInFile(input_api, f):
     pattern = input_api.re.compile('^FAIL')
     errors = []
     for line_num, line in f.ChangedContents():
         if pattern.match(line):
             errors.append('    %s:%d %s' % (f.LocalPath(), line_num, line))
     return errors
 
 
-def _CheckFilePermissions(input_api, output_api):
-    """Check that all files have their permissions properly set."""
-    if input_api.platform == 'win32':
-        return []
-    args = [input_api.python_executable,
-            input_api.os_path.join(
-                input_api.change.RepositoryRoot(),
-                'tools/checkperms/checkperms.py'),
-            '--root', input_api.change.RepositoryRoot()]
-    for f in input_api.AffectedFiles():
-        args += ['--file', f.LocalPath()]
-    try:
-        input_api.subprocess.check_output(args)
-        return []
-    except input_api.subprocess.CalledProcessError as error:
-        return [output_api.PresubmitError(
-            'checkperms.py failed:',
-            long_text=error.output)]
-
-
 def _CheckForInvalidPreferenceError(input_api, output_api):
     pattern = input_api.re.compile('Invalid name for preference: (.+)')
     results = []
 
     for f in input_api.AffectedFiles():
         if not f.LocalPath().endswith('-expected.txt'):
             continue
         for line_num, line in f.ChangedContents():
             error = pattern.search(line)
             if error:
@@ skipping 97 matching lines @@
     more information about slimming-paint-v2 tests see https://crbug.com/601275.
     """
     if not _ArePaintOrCompositingDirectoriesModified(change):
         return []
     return output_api.EnsureCQIncludeTrybotsAreAdded(
         cl,
         ['master.tryserver.chromium.linux:'
          'linux_layout_tests_slimming_paint_v2'],
         'Automatically added slimming-paint-v2 tests to run on CQ due to '
         'changes in paint or compositing directories.')