Don't require DEPS OWNERS when moving lines around in a DEPS file.

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 os.path
 import re
 import subprocess
 import unittest
 
 import PRESUBMIT
 from PRESUBMIT_test_mocks import MockChange, MockFile, MockAffectedFile
 from PRESUBMIT_test_mocks import MockInputApi, MockOutputApi
 
 _TEST_DATA_DIR = 'base/test/data/presubmit'
 
@@ skipping 446 matching lines @@
 
   def testValidIfDefinedMacroNames(self):
     lines = ['#if defined(FOO)',
              '#ifdef BAR',]
     errors = PRESUBMIT._CheckForInvalidIfDefinedMacrosInFile(
         MockInputApi(), MockFile('some/path/source.cc', lines))
     self.assertEqual(0, len(errors))
 
 
 class CheckAddedDepsHaveTetsApprovalsTest(unittest.TestCase):
-  def testFilesToCheckForIncomingDeps(self):
-    changed_lines = [
-      '"+breakpad",',
-      '"+chrome/installer",',
-      '"+chrome/plugin/chrome_content_plugin_client.h",',
-      '"+chrome/utility/chrome_content_utility_client.h",',
-      '"+chromeos/chromeos_paths.h",',
-      '"+components/crash/content",',
-      '"+components/nacl/common",',
-      '"+content/public/browser/render_process_host.h",',
-      '"+jni/fooblat.h",',
-      '"+grit",  # For generated headers',
-      '"+grit/generated_resources.h",',
-      '"+grit/",',
-      '"+policy",  # For generated headers and source',
-      '"+sandbox",',
-      '"+tools/memory_watcher",',
-      '"+third_party/lss/linux_syscall_support.h",',
+
+  def calculate(self, old_include_rules, old_specific_include_rules,
+                new_include_rules, new_specific_include_rules):
+    return PRESUBMIT._CalculateAddedDeps(
+        os.path, 'include_rules = %r\nspecific_include_rules = %r' % (
+            old_include_rules, old_specific_include_rules),
+        'include_rules = %r\nspecific_include_rules = %r' % (
+            new_include_rules, new_specific_include_rules))
+
+  def testCalculateAddedDeps(self):
+    old_include_rules = [
+        '+base',
+        '-chrome',
+        '+content',
+        '-grit',
+        '-grit/",',
+        '+jni/fooblat.h',
+        '!sandbox',
     ]
-    files_to_check = PRESUBMIT._FilesToCheckForIncomingDeps(re, changed_lines)
+    old_specific_include_rules = {
+        'compositor\.*': {
+            '+cc',
+        },
+    }
+
+    new_include_rules = [
+        '-ash',
+        '+base',
+        '+chrome',
+        '+components',
+        '+content',
+        '+grit',
+        '+grit/generated_resources.h",',
+        '+grit/",',
+        '+jni/fooblat.h',
+        '+policy',
+        '+third_party/WebKit',
+    ]
+    new_specific_include_rules = {
+        'compositor\.*': {
+            '+cc',
+        },
+        'widget\.*': {
+            '+gpu',
+        },
+    }
+
     expected = set([
-      'breakpad/DEPS',
-      'chrome/installer/DEPS',
-      'chrome/plugin/chrome_content_plugin_client.h',
-      'chrome/utility/chrome_content_utility_client.h',
-      'chromeos/chromeos_paths.h',
-      'components/crash/content/DEPS',
-      'components/nacl/common/DEPS',
-      'content/public/browser/render_process_host.h',
-      'policy/DEPS',
-      'sandbox/DEPS',
-      'tools/memory_watcher/DEPS',
-      'third_party/lss/linux_syscall_support.h',
+        'chrome/DEPS',
+        'gpu/DEPS',
+        'components/DEPS',
+        'policy/DEPS',
+        'third_party/WebKit/DEPS',
     ])
-    self.assertEqual(expected, files_to_check);
+    self.assertEqual(
+        expected,
+        self.calculate(old_include_rules, old_specific_include_rules,
+                       new_include_rules, new_specific_include_rules))
+
+  def testCalculateAddedDepsIgnoresPermutations(self):
+    old_include_rules = [
+        '+base',
+        '+chrome',
+    ]
+    new_include_rules = [
+        '+chrome',
+        '+base',
+    ]
+    self.assertEqual(set(),
+                     self.calculate(old_include_rules, {}, new_include_rules,
+                                    {}))
 
 
 class JSONParsingTest(unittest.TestCase):
   def testSuccess(self):
     input_api = MockInputApi()
     filename = 'valid_json.json'
     contents = ['// This is a comment.',
                 '{',
                 '  "key1": ["value1", "value2"],',
                 '  "key2": 3  // This is an inline comment.',
@@ skipping 779 matching lines @@
     mock_input_api.files = [
       MockAffectedFile('chrome/browser/resources/blah.js', 'arrow => OK here'),
     ]
     warnings = PRESUBMIT._CheckForRiskyJsFeatures(
         mock_input_api, MockOutputApi())
     self.assertEqual(0, len(warnings))
 
 
 if __name__ == '__main__':
   unittest.main()