Don't make checkdeps ignore includes to directories that are brought in via deps. Most of these are already listed in DEPS files, and it seems that we want to prevent includes on them just like normal directories that are in our tree (otherwise content can depend on native_client, for ex)

Review URL: https://chromiumcodereview.appspot.com/10248005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134296 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 51 insertions, 20 deletions

diff --git a/DEPS b/DEPS
index 20c4b22..24ba928 100644
--- a/DEPS
+++ b/DEPS
@@ -451,6 +451,7 @@ include_rules = [
   # Everybody can use some things.
   "+base",
   "+build",
+  "+googleurl",
   "+ipc",
 
   # For now, we allow ICU to be included by specifying "unicode/...", although
diff --git a/ash/DEPS b/ash/DEPS
index 4a4d4b1..b9346e8 100644
--- a/ash/DEPS
+++ b/ash/DEPS
@@ -8,6 +8,7 @@ include_rules = [
   "+skia/ext",
   "+third_party/cros",
   "+third_party/cros_system_api",
+  "+third_party/skia",
   "+net",
   "+ui",
 ]
diff --git a/base/DEPS b/base/DEPS
index 80df202..f0aa936 100644
--- a/base/DEPS
+++ b/base/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+jni",
+  "+native_client",
   "+third_party/ashmem",
   "+third_party/apple_apsl",
   "+third_party/libevent",
diff --git a/chrome/DEPS b/chrome/DEPS
index 7795bf0..949cb3b 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+ash",
   "+crypto",
   "+gpu",
+  "+native_client",
   "+net",
   "+printing",
   "+sql",
@@ -31,6 +32,7 @@ include_rules = [
   "-crypto/third_party",
 
   # Allow inclusion of WebKit API files.
+  "+third_party/WebKit/Source/Platform/chromium",
   "+third_party/WebKit/Source/WebKit/chromium",
   "+webkit/appcache",
   "+webkit/blob",
@@ -40,9 +42,11 @@ include_rules = [
   "+webkit/quota",
 
   # Allow inclusion of third-party code:
+  "+third_party/hunspell",
   "+third_party/icon_family", # IconFamily for Mac.
   "+third_party/mozilla",     # Mozilla interface headers.
   "+third_party/npapi",       # NPAPI interface headers.
+  "+third_party/skia",
   "+third_party/tcmalloc",    # tcmallo
   "+third_party/GTM",         # Google Toolbox for Mac.
 
diff --git a/chrome/app/DEPS b/chrome/app/DEPS
index 680eaa9..e8880a2 100644
--- a/chrome/app/DEPS
+++ b/chrome/app/DEPS
@@ -12,6 +12,7 @@ include_rules = [
   "+media/base",  # For initializing media library.
   "+policy",  # For generated headers and source
   "+sandbox",
+  "+seccompsandbox",
   "+tools/memory_watcher",
   "+third_party/lss/linux_syscall_support.h",
 ]
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 012d4cc..fdd22ec 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+breakpad",
   "+chrome/app",
   "+chrome/app/locales",
   "+chrome/installer",
@@ -40,14 +41,15 @@ include_rules = [
   "-content/common",
 
   # Other libraries.
-  "+chrome/third_party/hunspell",
   "+chrome/third_party/mozilla_security_manager",
   "+libxml",  # For search engine definition parsing.
   "+third_party/apple_sample_code",  # Apple code ImageAndTextCell.
   "+third_party/cld",
   "+third_party/expat",
   "+third_party/iaccessible2",
+  "+third_party/icu",
   "+third_party/isimpledom",
+  "+third_party/leveldatabase",
   "+third_party/libevent",  # For the remote V8 debugging server
   "+third_party/libjingle",
   "+third_party/protobuf/src/google/protobuf",
diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS
index 27f2ce6..22e858e 100644
--- a/chrome/browser/chromeos/DEPS
+++ b/chrome/browser/chromeos/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
   "+cros",
   "+dbus",
+  "+third_party/mozc",
 ]
diff --git a/chrome/installer/DEPS b/chrome/installer/DEPS
index 14e06a6..15a202f 100644
--- a/chrome/installer/DEPS
+++ b/chrome/installer/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+breakpad",
   "+chrome_frame",
   "+google_update",
   "+rlz",
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS
index 9700f06..d27086f 100644
--- a/chrome/nacl/DEPS
+++ b/chrome/nacl/DEPS
@@ -2,5 +2,6 @@ include_rules = [
   "+chrome/app/breakpad_win.h",
   "+content/public/app/startup_helper_win.h",
   "+sandbox/src",
+  "+seccompsandbox",
   "+native_client/src",
 ]
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index d7c75d9..28cd104 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -20,5 +20,6 @@ include_rules = [
   "+webkit/plugins",
   "+third_party/cld/encodings/compact_lang_det/win",
   "+third_party/npapi/bindings",
+  "+third_party/smhasher",
   "+third_party/sqlite",
 ]
diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS
index 5e2a516..b5d4427 100644
--- a/chrome/tools/DEPS
+++ b/chrome/tools/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+breakpad",
   "+chrome/browser",
   "+chrome/third_party/hunspell/google",
   "+content/browser",
diff --git a/content/DEPS b/content/DEPS
index 6c72faf..450d146 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -36,13 +36,17 @@ include_rules = [
   "-tools",
 
   # Allow inclusion of third-party code:
+  "+third_party/angle",
+  "+third_party/flac",
   "+third_party/gpsd",
   "+third_party/mozilla",
   "+third_party/npapi/bindings",
+  "+third_party/skia",
   "+third_party/sqlite",
   "+third_party/tcmalloc",
   "+third_party/khronos",
-  # Allow inclusion of WebKit API files.
+  "+third_party/webrtc",
+  "+third_party/WebKit/Source/Platform/chromium",
   "+third_party/WebKit/Source/WebKit/chromium",
 
   # Aura is analogous to Win32 or a Gtk, so it is allowed.
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 92446b0..d937ab9 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -8,6 +8,7 @@ include_rules = [
   # Other libraries.
   "+third_party/iaccessible2",
   "+third_party/isimpledom",
+  "+third_party/speex",
 
   # DO NOT ADD ANY CHROME INCLUDES HERE!!!
   # See https://sites.google.com/a/chromium.org/dev/developers/content-module
diff --git a/content/common/DEPS b/content/common/DEPS
index cc5cd70..ec46498 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
   "+media/base",
+  "+seccompsandbox",
 ]
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index dff8978..7ad2f05 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -3,6 +3,7 @@ include_rules = [
   "+content/public/renderer",
   "+jingle/glue",
   "+media",  # For audio input/output and audio/video decoding.
+  "+third_party/libjingle",
   "+third_party/mach_override",
   "+third_party/tcmalloc",
   "+v8/include",
diff --git a/gpu/DEPS b/gpu/DEPS
index 8e88544..10ef807 100644
--- a/gpu/DEPS
+++ b/gpu/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+native_client",
   "+third_party/angle",
   "+../../gpu_export.h",
   "+../command_buffer",
diff --git a/jingle/DEPS b/jingle/DEPS
index 8fa9d48..f12bdb0 100644
--- a/jingle/DEPS
+++ b/jingle/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
   "+net",
+  "+third_party/libjingle",
 ]
diff --git a/media/DEPS b/media/DEPS
index 6ee9414..c9b8ea1 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+jni",
   "+third_party/ffmpeg",
   "+third_party/openmax",
+  "+third_party/skia",
   "+ui/gfx",
   "+ui/gfx/gl",
 ]
diff --git a/net/DEPS b/net/DEPS
index 52142e6..9bb55de 100644
--- a/net/DEPS
+++ b/net/DEPS
@@ -6,7 +6,8 @@ include_rules = [
   "+third_party/libevent",
   "+third_party/nss",
   "+third_party/zlib",
-  "+sdch/open_vcdiff",
+  "+sdch/open-vcdiff",
+  "+v8",
 ]
 
 skip_child_includes = [
diff --git a/ppapi/DEPS b/ppapi/DEPS
index fba1a39..6a80a83 100644
--- a/ppapi/DEPS
+++ b/ppapi/DEPS
@@ -1,3 +1,8 @@
+include_rules = [
+  "+third_party/skia",
+  "+third_party/WebKit/Source/WebKit/chromium/public",
+]
+
 # checkdeps.py shouldn't check include paths for files in these dirs:
 skip_child_includes = [
   # TODO(bradnelson): fix these to comply, once migration is complete.
diff --git a/printing/DEPS b/printing/DEPS
index 03fe6d7..bd54ac8 100644
--- a/printing/DEPS
+++ b/printing/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
-  "+base",
   "+skia/ext",
+  "+third_party/skia",
   "+ui/base/text",
   "+ui/gfx",
 ]
diff --git a/remoting/DEPS b/remoting/DEPS
index 0dc9ee7..711e7dc 100644
--- a/remoting/DEPS
+++ b/remoting/DEPS
@@ -13,5 +13,7 @@ include_rules = [
   "+skia/ext",
   "+third_party/GTM",
   "+third_party/GTM/AppKit",
+  "+third_party/libjingle",
+  "+third_party/libvpx",
   "+third_party/skia/include/core",
 ]
diff --git a/tools/checkdeps/checkdeps.py b/tools/checkdeps/checkdeps.py
index 02d8d14..0e98dafc 100755
--- a/tools/checkdeps/checkdeps.py
+++ b/tools/checkdeps/checkdeps.py
@@ -59,9 +59,6 @@ import re
 import sys
 import copy
 
-# Variable name used in the DEPS file to specify module-level deps.
-DEPS_VAR_NAME = "deps"
-
 # Variable name used in the DEPS file to add or subtract include files from
 # the module-level deps.
 INCLUDE_RULES_VAR_NAME = "include_rules"
@@ -170,12 +167,11 @@ class Rules:
     return (False, "no rule applying")
 
 
-def ApplyRules(existing_rules, deps, includes, cur_dir):
-  """Applies the given deps and include rules, returning the new rules.
+def ApplyRules(existing_rules, includes, cur_dir):
+  """Applies the given include rules, returning the new rules.
 
   Args:
     existing_rules: A set of existing rules that will be combined.
-    deps: The list of imports from the "deps" section of the DEPS file.
     include: The list of rules from the "include_rules" section of DEPS.
     cur_dir: The current directory. We will create an implicit rule that
              allows inclusion from this directory.
@@ -199,13 +195,6 @@ def ApplyRules(existing_rules, deps, includes, cur_dir):
                     " for\n  %s and base dir\n  %s" %
                     (cur_dir, BASE_DIRECTORY))
 
-  # Next apply the DEPS additions, these are all allowed. Note that DEPS start
-  # out with "src/" which we want to trim.
-  for (index, key) in enumerate(deps):
-    if key.startswith("src/"):
-      key = key[4:]
-    rules.AddRule("+" + key, relative_dir + "'s deps for " + key)
-
   # Last, apply the additional explicit rules.
   for (index, rule_str) in enumerate(includes):
     if not len(relative_dir):
@@ -275,12 +264,10 @@ def ApplyDirectoryRules(existing_rules, dir_name):
 
   # Even if a DEPS file does not exist we still invoke ApplyRules
   # to apply the implicit "allow" rule for the current directory
-  deps = local_scope.get(DEPS_VAR_NAME, {})
   include_rules = local_scope.get(INCLUDE_RULES_VAR_NAME, [])
   skip_subdirs = local_scope.get(SKIP_SUBDIRS_VAR_NAME, [])
 
-  return (ApplyRules(existing_rules, deps, include_rules, dir_name),
-          skip_subdirs)
+  return (ApplyRules(existing_rules, include_rules, dir_name), skip_subdirs)
 
 
 def ShouldCheckFile(file_name):
diff --git a/ui/DEPS b/ui/DEPS
index 861c4d4..95ac0b8 100644
--- a/ui/DEPS
+++ b/ui/DEPS
@@ -5,4 +5,5 @@ include_rules = [
   "+net",
   "+skia",
   "+third_party/mozilla",
+  "+third_party/skia",
 ]
diff --git a/ui/gfx/DEPS b/ui/gfx/DEPS
index 548fe15..5dbfdb5 100644
--- a/ui/gfx/DEPS
+++ b/ui/gfx/DEPS
@@ -2,4 +2,5 @@ include_rules = [
   "+base",
   "+grit/gfx_resources.h",
   "+skia",
+  "+third_party/angle",
 ]
diff --git a/ui/gfx/compositor/DEPS b/ui/gfx/compositor/DEPS
index 956b453..b37b8c6 100644
--- a/ui/gfx/compositor/DEPS
+++ b/ui/gfx/compositor/DEPS
@@ -2,6 +2,8 @@
 # the compositor/ui. These lines will disappear once we can extract the Chromium
 # Compositor out of WebKit.
 include_rules = [
+  "+third_party/WebKit/Source/Platform/chromium/public",
+  "+third_party/WebKit/Source/WebKit/chromium",
   "+webkit/glue",
   "+webkit/gpu",
 ]
diff --git a/webkit/DEPS b/webkit/DEPS
index dc3946a..1c45bea 100644
--- a/webkit/DEPS
+++ b/webkit/DEPS
@@ -10,8 +10,14 @@ include_rules = [
   "+bridge",
   "+grit",  # For generated headers
   "+skia",
+  "+third_party/angle",
+  "+third_party/leveldatabase",
+  "+third_party/skia",
   "+third_party/sqlite",
   "+third_party/tcmalloc",
+  "+third_party/WebKit/Source/Platform/chromium",
+  "+third_party/WebKit/Source/WebKit/chromium",
+  "+v8",
 
   # For databases/
   "+sql",
diff --git a/webkit/tools/test_shell/DEPS b/webkit/tools/test_shell/DEPS
index 4c57ff7..2b74457 100644
--- a/webkit/tools/test_shell/DEPS
+++ b/webkit/tools/test_shell/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+breakpad",
   "+mac",
   "+third_party/zlib",
   "+ui",