Make DISALLOW_* presubmit stricter

PRESUBMIT_test.py

 #!/usr/bin/env python
 # 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.
 
 import glob
 import json
 import os
 import re
 import subprocess
@@ skipping 415 matching lines @@
 %sDISALLOW_%s(Thing);
 };
 """ % (macro, line_prefix, header)).splitlines()
 
   def testBaseMacrosInHeadersBad(self):
     mock_input_api = MockInputApi()
     mock_input_api.files = [
       MockAffectedFile('foo.h', self._make_h('not_macros', 'ASSIGN')),
       MockAffectedFile('bar.h', self._make_h('not_macros', 'COPY')),
       MockAffectedFile('baz.h', self._make_h('not_macros', 'COPY_AND_ASSIGN')),
-      MockAffectedFile('qux.h', self._make_h('not_macros', 'EVIL')),
+      MockAffectedFile('qux.h', self._make_h('not_macros',
+                                             'EVIL_CONSTRUCTORS')),
+      MockAffectedFile('quux.h', self._make_h('not_macros',
+                                              'IMPLICIT_CONSTRUCTORS')),
     ]
     warnings = PRESUBMIT._CheckBaseMacrosInHeaders(mock_input_api,
                                                    MockOutputApi())
     self.assertEqual(1, len(warnings))
-    self.assertEqual(4, len(warnings[0].items))
+    self.assertEqual(len(mock_input_api.files), len(warnings[0].items))
 
   def testBaseMacrosInHeadersGood(self):
     mock_input_api = MockInputApi()
     mock_input_api.files = [
       MockAffectedFile('foo.h', self._make_h('macros', 'ASSIGN')),
       MockAffectedFile('bar.h', self._make_h('macros', 'COPY')),
       MockAffectedFile('baz.h', self._make_h('macros', 'COPY_AND_ASSIGN')),
-      MockAffectedFile('qux.h', self._make_h('macros', 'EVIL')),
-      MockAffectedFile('foz.h', self._make_h('not_macros', 'ASSIGN', '//')),
-      MockAffectedFile('foz.h', self._make_h('not_macros', 'ASSIGN', '  //')),
+      MockAffectedFile('qux.h', self._make_h('macros', 'EVIL_CONSTRUCTORS')),
+      MockAffectedFile('quux.h', self._make_h('macros',
+                                              'IMPLICIT_CONSTRUCTORS')),
+      MockAffectedFile('corge.h', self._make_h('not_macros', 'ASSIGN', '//')),
+      MockAffectedFile('grault.h', self._make_h('not_macros', 'ASSIGN', ' //')),
     ]
     warnings = PRESUBMIT._CheckBaseMacrosInHeaders(mock_input_api,
                                                    MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 class InvalidOSMacroNamesTest(unittest.TestCase):
   def testInvalidOSMacroNames(self):
     lines = ['#if defined(OS_WINDOWS)',
              ' #elif defined(OS_WINDOW)',
@@ skipping 549 matching lines @@
                ['char* host = "https://www.aol.com"; // google.com'])
     ]
 
     warnings = PRESUBMIT._CheckHardcodedGoogleHostsInLowerLayers(
       input_api, MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 if __name__ == '__main__':
   unittest.main()