Clean up android_webview OWNERS and DEPS

We no longer have egregious chrome/ dependencies, so lib/OWNERS is no
longer required.

BUG=


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

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

9 files changed, 22 insertions, 19 deletions

diff --git a/android_webview/DEPS b/android_webview/DEPS
index 8846a62..2ae1b78 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -1,17 +1,15 @@
-# Please add joi@ or erikwright@ as reviewers for any changes to DEPS files
-# under android_webview/ as they are keeping track of what needs to become a
-# Browser Component.
+# Please include joth@ and (joi@ or erikwright@) on the review for any changes
+# to DEPS files under android_webview/ 
 
-# Do not add any includes under chrome/ to this DEPS file. Code that depends on
-# chrome/ should go into android_webview/lib/ or be refactored.
+# With the exception of chrome/browser/component, do not add any includes under
+# chrome/ anywhere in android_webview.
 
 include_rules = [
   # lib is the top-level target, and must remain a leaf in the dependency tree.
   "-android_webview/lib",
 
-  "+chrome/android/java/src/org/chromium/chrome/browser/component",
   "+chrome/browser/component",
-  "+content/public",
+  "+content/public/common",
   "+jni",
   "+net",
   "+ui/android",
diff --git a/android_webview/OWNERS b/android_webview/OWNERS
index f90ad4a..1bb57fa 100644
--- a/android_webview/OWNERS
+++ b/android_webview/OWNERS
@@ -1,6 +1,8 @@
+# Please include joth@ and (joi@ or erikwright@) on the review for any changes
+# to DEPS files under android_webview/ 
+
 benm@chromium.org
 joth@chromium.org
 mkosiba@chromium.org
 mnaganov@chromium.org
-steveblock@chromium.org
 torne@chromium.org
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index fe52e98..2892748 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -3,6 +3,8 @@ include_rules = [
   "+android_webview/browser",
   "+android_webview/common",
 
+  "+content/public/browser",
+
   # Temporary until we bundle our own favicon. See
   # AwContentBrowserClient::GetDefaultFavicon
   "!grit/ui_resources.h",
diff --git a/android_webview/java/DEPS b/android_webview/java/DEPS
new file mode 100644
index 0000000..0d019e1
--- /dev/null
+++ b/android_webview/java/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+content/public/android/java",
+]
diff --git a/android_webview/javatests/DEPS b/android_webview/javatests/DEPS
index 7abdb00..799bc5b 100644
--- a/android_webview/javatests/DEPS
+++ b/android_webview/javatests/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
-  # Temporary until we move all common test code to content/public/android.
-  "!content/android/javatests",
+  "+content/public/android/java",
+  "+content/public/test/android/javatests",
 ]
diff --git a/android_webview/lib/DEPS b/android_webview/lib/DEPS
index e3acadf..a863f72 100644
--- a/android_webview/lib/DEPS
+++ b/android_webview/lib/DEPS
@@ -1,8 +1,6 @@
-# Please add joi@ or erikwright@ as reviewers for any changes to DEPS files
-# under android_webview/ as they are keeping track of what needs to become a
-# Browser Component.
-
 include_rules = [
+  "+content/public",
+
   # Temporary until fixing bug 153758.
   "!ui/base/ui_base_switches.h",
 ]
diff --git a/android_webview/lib/OWNERS b/android_webview/lib/OWNERS
deleted file mode 100644
index d0ddbe3..0000000
--- a/android_webview/lib/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-# Intentionally limiting approvers as this directory hold undesired chrome/
-# layer dependencies.
-set noparent
-joth@chromium.org
-torne@chromium.org
diff --git a/android_webview/native/DEPS b/android_webview/native/DEPS
new file mode 100644
index 0000000..1c35d9c
--- /dev/null
+++ b/android_webview/native/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+content/public/browser",
+]
diff --git a/android_webview/renderer/DEPS b/android_webview/renderer/DEPS
index 6d87f17..5ee0454 100644
--- a/android_webview/renderer/DEPS
+++ b/android_webview/renderer/DEPS
@@ -2,6 +2,8 @@ include_rules = [
   "-android_webview",
   "+android_webview/common",
   "+android_webview/renderer",
+
+  "+content/public/renderer",
  
   "+third_party/WebKit/Source/WebKit/chromium",
 ]