Move WebContentsDelegateAndroid to content/components

chrome/browser/android/chrome_jni_registrar.cc

Index: chrome/browser/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 7466ce3b224743be7292308408d3c684a83a13b6..de12761eb33dd35f0755b241d670395a1fcb2283 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -12,12 +12,12 @@
 #include "chrome/browser/android/intent_helper.h"
 #include "chrome/browser/android/process_utils.h"
 #include "chrome/browser/android/provider/chrome_browser_provider.h"
-#include "chrome/browser/component/web_contents_delegate_android/component_jni_registrar.h"
 #include "chrome/browser/history/android/sqlite_cursor.h"
 #include "chrome/browser/ui/android/autofill/autofill_external_delegate.h"
 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
 #include "content/components/navigation_interception/component_jni_registrar.h"
+#include "content/components/web_contents_delegate_android/component_jni_registrar.h"
 
 namespace chrome {
 namespace android {
@@ -42,7 +42,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
 };
 
 bool RegisterJni(JNIEnv* env) {
-  web_contents_delegate_android::RegisterJni(env);
+  content::RegisterWebContentsDelegateAndroidJni(env);
   return RegisterNativeMethods(env, kChromeRegisteredMethods,
                                arraysize(kChromeRegisteredMethods));
 }