Move content/components/navigation_interception to src/components

BUG=169312

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

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

10 files changed, 20 insertions, 18 deletions

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 312ed43..90a3860 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -40,7 +40,7 @@ LOCAL_SRC_FILES += \
     $(call all-java-files-under, \
         ../components/web_contents_delegate_android/android/java/src) \
     $(call all-java-files-under, \
-        ../content/components/navigation_interception/java/src) \
+        ../components/navigation_interception/android/java/src) \
 
 
 # Generated by net.gyp:net_errors_java, net.gyp:certificate_mime_types_java,
diff --git a/android_webview/DEPS b/android_webview/DEPS
index fa3868b..d5e52b5 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -1,5 +1,5 @@
 # Please include joth@ and (joi@ or erikwright@) on the review for any changes
-# to DEPS files under android_webview/ 
+# to DEPS files under android_webview/
 
 # Do not add any includes under chrome/ anywhere in android_webview.
 
@@ -9,8 +9,6 @@ include_rules = [
 
   "!chrome/browser/component",
   "+cc",
-  # TODO(boliu): Remove this when content/components is moved to components/.
-  "+content/components",
   "+content/public/common",
   "+jni",
   "+net",
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index b033141..2011891 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -100,9 +100,9 @@
       'type': 'static_library',
       'dependencies': [
         '../android_webview/native/webview_native.gyp:webview_native',
+        '../components/components.gyp:navigation_interception',
         '../components/components.gyp:web_contents_delegate_android',
         '../content/content.gyp:content',
-        '../content/content.gyp:navigation_interception',
         '../skia/skia.gyp:skia',
         'android_webview_pak',
       ],
@@ -187,9 +187,9 @@
       'target_name': 'android_webview_java',
       'type': 'none',
       'dependencies': [
-        '../content/content.gyp:content_java',
-        '../content/content.gyp:navigation_interception_java',
+        '../components/components.gyp:navigation_interception_java',
         '../components/components.gyp:web_contents_delegate_android_java',
+        '../content/content.gyp:content_java',
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
@@ -203,9 +203,9 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java',
+        '../components/components.gyp:navigation_interception_java',
         '../components/components.gyp:web_contents_delegate_android_java',
         '../content/content.gyp:content_java',
-        '../content/content.gyp:navigation_interception_java',
         '../media/media.gyp:media_java',
         '../net/net.gyp:net_java',
         '../ui/ui.gyp:ui_java',
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index 2892748..1bcae2d 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -3,6 +3,7 @@ include_rules = [
   "+android_webview/browser",
   "+android_webview/common",
 
+  "+components/navigation_interception",
   "+content/public/browser",
 
   # Temporary until we bundle our own favicon. See
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 03652da..c00a8ed 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -11,7 +11,7 @@
 #include "android_webview/common/url_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "content/components/navigation_interception/intercept_navigation_delegate.h"
+#include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
@@ -22,8 +22,8 @@
 #include "net/url_request/url_request.h"
 
 using android_webview::AwContentsIoThreadClient;
+using components::InterceptNavigationDelegate;
 using content::BrowserThread;
-using content::InterceptNavigationDelegate;
 
 namespace {
 
diff --git a/android_webview/java/DEPS b/android_webview/java/DEPS
index 9f7ec84..a6c4c30 100644
--- a/android_webview/java/DEPS
+++ b/android_webview/java/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
   "+content/public/android/java",
+  "+components/navigation_interception/android/java",
   "+components/web_contents_delegate_android/android/java",
 ]
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 754c87b7..317ac1d 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -31,7 +31,7 @@ import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.PageTransitionTypes;
 import org.chromium.content.common.CleanupReference;
-import org.chromium.content.components.navigation_interception.InterceptNavigationDelegate;
+import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.net.GURLUtils;
 import org.chromium.net.X509Util;
 import org.chromium.ui.gfx.NativeWindow;
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index a7338b1..e005098 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -6,16 +6,17 @@
 #include "android_webview/native/android_webview_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "components/navigation_interception/component_jni_registrar.h"
 #include "components/web_contents_delegate_android/component_jni_registrar.h"
-#include "content/components/navigation_interception/component_jni_registrar.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 
 static base::android::RegistrationMethod
-kWebViewDependencyRegisteredMethods[] = {
-  { "NavigationInterception", content::RegisterNavigationInterceptionJni },
-  { "WebContentsDelegateAndroid",
-      components::RegisterWebContentsDelegateAndroidJni },
+    kWebViewDependencyRegisteredMethods[] = {
+    { "NavigationInterception",
+        components::RegisterNavigationInterceptionJni },
+    { "WebContentsDelegateAndroid",
+        components::RegisterWebContentsDelegateAndroidJni },
 };
 
 // This is called by the VM when the shared library is first loaded.
diff --git a/android_webview/native/DEPS b/android_webview/native/DEPS
index 452c80b..6693d30 100644
--- a/android_webview/native/DEPS
+++ b/android_webview/native/DEPS
@@ -4,6 +4,7 @@ include_rules = [
   "+ui/gl",
 
   # Components that Android WebView depends on.
+  "+components/navigation_interception",
   "+components/web_contents_delegate_android",
 
   # TODO(joth): Remove if we can move the compositor driver into ../browser/
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index e319f58..3750650 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -27,7 +27,7 @@
 #include "base/pickle.h"
 #include "base/supports_user_data.h"
 #include "cc/layer.h"
-#include "content/components/navigation_interception/intercept_navigation_delegate.h"
+#include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
@@ -65,9 +65,9 @@ using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using components::InterceptNavigationDelegate;
 using content::BrowserThread;
 using content::ContentViewCore;
-using content::InterceptNavigationDelegate;
 using content::WebContents;
 
 extern "C" {