Tighten DEPS in ios/

The DEPS checker implicitly allow all files in a subdirectory of src/
to include any other file in the same directory. This meant that any
file in ios/ could include any other file except when explicitly
forbidden.

This CL change this by disabling all inclusion of files from ios/ at
the root level, leaving the dependency decision to the individual
subdirectories.

BUG=None

Review URL: https://codereview.chromium.org/952633002

Cr-Commit-Position: refs/heads/master@{#317816}

7 files changed, 32 insertions, 7 deletions

diff --git a/ios/DEPS b/ios/DEPS
new file mode 100644
index 0000000..2ee6925
--- /dev/null
+++ b/ios/DEPS
@@ -0,0 +1,8 @@
+include_rules = [
+  # The subdirectories in ios/ will manually allow their own include
+  # directories in ios/ so we disallow all of them.
+  "-ios",
+
+  # For unit tests.
+  "+third_party/ocmock",
+]
diff --git a/ios/chrome/DEPS b/ios/chrome/DEPS
index 109b2da..32c8bbd 100644
--- a/ios/chrome/DEPS
+++ b/ios/chrome/DEPS
@@ -1,4 +1,9 @@
 include_rules = [
+  # The subdirectories in ios/chrome/ will manually allow their own include
+  # directories in ios/chrome/ so we disallow all of them.
+  "-ios/chrome",
+  "+ios/chrome/grit",
+
   "+components/infobars/core",
   "+components/keyed_service/core",
   "+components/keyed_service/ios",
@@ -6,23 +11,20 @@ include_rules = [
   "+components/suggestions",
   "+components/translate/core",
   "+components/translate/ios",
-  "+components/webp_transcode",
   "+components/web_resource",
+  "+components/webp_transcode",
   "+ios/public/provider/chrome",
   "+ios/web/public",
   "+net",
-  "+third_party/ocmock",
   "+ui",
 
+  # For tests.
+  "+ios/public/test",
+
   # Only parts of skia are compiled on iOS, so we explicitly list the
   # files that can be included to avoid bringing in more code.
   "+skia/ext/skia_utils_ios.h",
 
   # Generated file for translated strings in components.
   "+grit/components_strings.h",
-
-  # ios/chrome is not allowed to depend on //chrome, //content.
-  # No exceptions.
-  "-chrome",
-  "-content",
 ]
diff --git a/ios/chrome/test/DEPS b/ios/chrome/test/DEPS
new file mode 100644
index 0000000..9074a78
--- /dev/null
+++ b/ios/chrome/test/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+ios/chrome/browser",
+]
diff --git a/ios/public/provider/DEPS b/ios/public/provider/DEPS
new file mode 100644
index 0000000..38c51b8
--- /dev/null
+++ b/ios/public/provider/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  # Make individual subdirectories declare DEPS on other ios/public/provider
+  # subdirectories to ensure that there are no layering violations.
+  "-ios/public/provider",
+]
diff --git a/ios/public/provider/chrome/DEPS b/ios/public/provider/chrome/DEPS
new file mode 100644
index 0000000..0fc0ddd
--- /dev/null
+++ b/ios/public/provider/chrome/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+ios/web/public",
+]
diff --git a/ios/public/provider/web/DEPS b/ios/public/provider/web/DEPS
new file mode 100644
index 0000000..0fc0ddd
--- /dev/null
+++ b/ios/public/provider/web/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+ios/web/public",
+]
diff --git a/ios/web/DEPS b/ios/web/DEPS
index 71080cb..2f189bf 100644
--- a/ios/web/DEPS
+++ b/ios/web/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+ios/web",
   "+net",
   "+third_party/libwebp/webp",
   "+ui",