Make DISALLOW_* presubmit stricter

PRESUBMIT_test.py

Index: PRESUBMIT_test.py
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index e488c944de4e6dee1bd6e4f32858f171124da0be..81d022f2a6e138bf54bbd6c2c1555b5023722968 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -433,12 +433,15 @@ class Thing {
       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()
@@ -446,9 +449,11 @@ class Thing {
       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())