Move content/components/navigation_interception to src/components

android_webview/lib/main/webview_entry_point.cc

Index: android_webview/lib/main/webview_entry_point.cc
diff --git a/android_webview/lib/main/webview_entry_point.cc b/android_webview/lib/main/webview_entry_point.cc
index a7338b16fa0b261e0e3a473a1f89f7cd55c2224a..e0050981f4a667b0771f580ad922050018108641 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[] = {

[boliu, 2013/01/15 22:40:46]

I've got no idea how indenting should work here...

I was following the convention of method declarations with super long return
types and which does not indent the name of the function.

+    { "NavigationInterception",
+        components::RegisterNavigationInterceptionJni },
+    { "WebContentsDelegateAndroid",
+        components::RegisterWebContentsDelegateAndroidJni },
 };
 
 // This is called by the VM when the shared library is first loaded.