| Index: PRESUBMIT.py
|
| diff --git a/PRESUBMIT.py b/PRESUBMIT.py
|
| index 4e1edcc620898423aa36c5f0e184342d5cc9be5a..ead0cf3dc4f8980536f1a540a1f53d468e1fa99e 100644
|
| --- a/PRESUBMIT.py
|
| +++ b/PRESUBMIT.py
|
| @@ -1537,31 +1537,6 @@ def _CheckSingletonInHeaders(input_api, output_api):
|
| return []
|
|
|
|
|
| -def _CheckBaseMacrosInHeaders(input_api, output_api):
|
| - """Check for base/macros.h if DISALLOW_* macro is used."""
|
| -
|
| - disallows = ('DISALLOW_ASSIGN', 'DISALLOW_COPY', 'DISALLOW_EVIL')
|
| - macros = '#include "base/macros.h"'
|
| - basictypes = '#include "base/basictypes.h"'
|
| -
|
| - files = []
|
| - for f in input_api.AffectedSourceFiles(None):
|
| - if not f.LocalPath().endswith('.h'):
|
| - continue
|
| - for line_num, line in f.ChangedContents():
|
| - if line.lstrip().startswith('//'): # Strip C++ comment.
|
| - continue
|
| - if any(d in line for d in disallows):
|
| - contents = input_api.ReadFile(f)
|
| - if not (macros in contents or basictypes in contents):
|
| - files.append(f)
|
| - break
|
| -
|
| - msg = ('The following files appear to be using DISALLOW_* macros.\n'
|
| - 'Please #include "base/macros.h" in them.')
|
| - return [output_api.PresubmitError(msg, files)] if files else []
|
| -
|
| -
|
| _DEPRECATED_CSS = [
|
| # Values
|
| ( "-webkit-box", "flex" ),
|
| @@ -1692,7 +1667,6 @@ def _CommonChecks(input_api, output_api):
|
| results.extend(_CheckForCopyrightedCode(input_api, output_api))
|
| results.extend(_CheckForWindowsLineEndings(input_api, output_api))
|
| results.extend(_CheckSingletonInHeaders(input_api, output_api))
|
| - results.extend(_CheckBaseMacrosInHeaders(input_api, output_api))
|
|
|
| if any('PRESUBMIT.py' == f.LocalPath() for f in input_api.AffectedFiles()):
|
| results.extend(input_api.canned_checks.RunUnitTestsInDirectory(
|
|
|