Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

Moving files, change namespace from content to components,
added/updated DEPS files, and fix builds

BUG=169312

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

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

11 files changed, 31 insertions, 14 deletions

diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index c1aa86a..312ed43 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -38,7 +38,7 @@ LOCAL_SRC_FILES += \
 # browser components
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, \
-        ../content/components/web_contents_delegate_android/java/src) \
+        ../components/web_contents_delegate_android/android/java/src) \
     $(call all-java-files-under, \
         ../content/components/navigation_interception/java/src) \
 
diff --git a/android_webview/DEPS b/android_webview/DEPS
index 740e94d..fa3868b 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -9,6 +9,7 @@ include_rules = [
 
   "!chrome/browser/component",
   "+cc",
+  # TODO(boliu): Remove this when content/components is moved to components/.
   "+content/components",
   "+content/public/common",
   "+jni",
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 5f95e09..ab8691e 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:web_contents_delegate_android',
         '../content/content.gyp:content',
         '../content/content.gyp:navigation_interception',
-        '../content/content.gyp:web_contents_delegate_android',
         '../skia/skia.gyp:skia',
         'android_webview_pak',
       ],
@@ -187,7 +187,7 @@
       'dependencies': [
         '../content/content.gyp:content_java',
         '../content/content.gyp:navigation_interception_java',
-        '../content/content.gyp:web_contents_delegate_android_java',
+        '../components/components.gyp:web_contents_delegate_android_java',
         '../ui/ui.gyp:ui_java',
       ],
       'variables': {
@@ -201,9 +201,9 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java',
+        '../components/components.gyp:web_contents_delegate_android_java',
         '../content/content.gyp:content_java',
         '../content/content.gyp:navigation_interception_java',
-        '../content/content.gyp:web_contents_delegate_android_java',
         '../media/media.gyp:media_java',
         '../net/net.gyp:net_java',
         '../ui/ui.gyp:ui_java',
diff --git a/android_webview/java/DEPS b/android_webview/java/DEPS
index 0d019e1..9f7ec84 100644
--- a/android_webview/java/DEPS
+++ b/android_webview/java/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
   "+content/public/android/java",
+  "+components/web_contents_delegate_android/android/java",
 ]
diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
index 3479e2e..59c6422 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
@@ -6,7 +6,7 @@ package org.chromium.android_webview;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.content.components.web_contents_delegate_android.WebContentsDelegateAndroid;
+import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 
 /**
  * WebView-specific WebContentsDelegate.
diff --git a/android_webview/lib/DEPS b/android_webview/lib/DEPS
index f3505d7..b0da14f 100644
--- a/android_webview/lib/DEPS
+++ b/android_webview/lib/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
   "+cc/switches.h",
+  "+components",  # For jni registers.
   "+content/public",
 ]
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index 567161e..a7338b1 100644
--- a/android_webview/lib/main/webview_entry_point.cc
+++ b/android_webview/lib/main/webview_entry_point.cc
@@ -5,9 +5,19 @@
 #include "android_webview/lib/main/aw_main_delegate.h"
 #include "android_webview/native/android_webview_jni_registrar.h"
 #include "base/android/jni_android.h"
+#include "base/android/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 },
+};
+
 // This is called by the VM when the shared library is first loaded.
 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
@@ -16,6 +26,13 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   if (!content::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
+  // Register JNI for components we depend on.
+  if (!RegisterNativeMethods(
+      env,
+      kWebViewDependencyRegisteredMethods,
+      arraysize(kWebViewDependencyRegisteredMethods)))
+    return -1;
+
   if (!android_webview::RegisterJni(env))
     return -1;
 
diff --git a/android_webview/native/DEPS b/android_webview/native/DEPS
index 3067d75..452c80b 100644
--- a/android_webview/native/DEPS
+++ b/android_webview/native/DEPS
@@ -3,6 +3,9 @@ include_rules = [
   "+ui/gfx",
   "+ui/gl",
 
+  # Components that Android WebView depends on.
+  "+components/web_contents_delegate_android",
+
   # TODO(joth): Remove if we can move the compositor driver into ../browser/
   "+third_party/skia/include",
 ]
diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc
index 4863295..64e6073 100644
--- a/android_webview/native/android_webview_jni_registrar.cc
+++ b/android_webview/native/android_webview_jni_registrar.cc
@@ -16,16 +16,10 @@
 #include "android_webview/native/js_result_handler.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "content/components/navigation_interception/component_jni_registrar.h"
-#include "content/components/web_contents_delegate_android/component_jni_registrar.h"
 
 namespace android_webview {
 
 static base::android::RegistrationMethod kWebViewRegisteredMethods[] = {
-  // Register JNI for components we depend on.
-  { "navigation_interception", content::RegisterNavigationInterceptionJni },
-  { "web_contents_delegate_android",
-      content::RegisterWebContentsDelegateAndroidJni },
   // Register JNI for android_webview classes.
   { "AndroidProtocolHandler", RegisterAndroidProtocolHandler },
   { "AwContents", RegisterAwContents },
diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
index c9270d0..737c6b1 100644
--- a/android_webview/native/aw_web_contents_delegate.h
+++ b/android_webview/native/aw_web_contents_delegate.h
@@ -7,7 +7,7 @@
 
 #include <jni.h>
 
-#include "content/components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 namespace android_webview {
 
@@ -15,7 +15,7 @@ namespace android_webview {
 // Should contain WebContentsDelegate code required by WebView that should not
 // be part of the Chromium Android port.
 class AwWebContentsDelegate
-    : public content::WebContentsDelegateAndroid {
+    : public components::WebContentsDelegateAndroid {
  public:
   AwWebContentsDelegate(JNIEnv* env, jobject obj);
   virtual ~AwWebContentsDelegate();
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 2d29820..431f966 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -11,7 +11,7 @@
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base_static',
-        '../../content/content.gyp:web_contents_delegate_android',
+        '../../components/components.gyp:web_contents_delegate_android',
         '../../skia/skia.gyp:skia',
         '../../ui/gl/gl.gyp:gl',
         'android_webview_native_jni',