Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

chrome/browser/android/chrome_jni_registrar.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/chrome_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/android/content_view_util.h"
 #include "chrome/browser/android/dev_tools_server.h"
 #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/history/android/sqlite_cursor.h"
 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
 #include "chrome/browser/ui/android/navigation_popup.h"
+#include "components/web_contents_delegate_android/component_jni_registrar.h"
 #include "content/components/navigation_interception/component_jni_registrar.h"
-#include "content/components/web_contents_delegate_android/color_chooser_android.h"
-#include "content/components/web_contents_delegate_android/component_jni_registrar.h"
 
 namespace chrome {
 namespace android {
 
 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
+  // Register JNI for components we depend on.
+  { "NavigationInterception", content::RegisterNavigationInterceptionJni },
+  { "WebContentsDelegateAndroid",
+      components::RegisterWebContentsDelegateAndroidJni },
+  // Register JNI for chrome classes.
   { "AutofillPopup",
       AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
   { "ChromeBrowserProvider",
       ChromeBrowserProvider::RegisterChromeBrowserProvider },
   { "ChromeHttpAuthHandler",
       ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
   { "ChromeWebContentsDelegateAndroid",
       RegisterChromeWebContentsDelegateAndroid },
-  { "ColorChooserAndroid", content::RegisterColorChooserAndroid },
   { "ContentViewUtil", RegisterContentViewUtil },
   { "DevToolsServer", RegisterDevToolsServer },
   { "IntentHelper", RegisterIntentHelper },
   { "JavascriptAppModalDialog",
       JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
   { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
   { "ProcessUtils", RegisterProcessUtils },
   { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
-  { "navigation_interception", content::RegisterNavigationInterceptionJni },
 };
 
 bool RegisterJni(JNIEnv* env) {
-  content::RegisterWebContentsDelegateAndroidJni(env);
   return RegisterNativeMethods(env, kChromeRegisteredMethods,
                                arraysize(kChromeRegisteredMethods));
 }
 
 } // namespace android
 } // namespace chrome