Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

content/browser/android/browser_jni_registrar.cc

Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 008ae8640457e3999df0666ede3d8ab02d896358..4699bbe950ad9a15f063f1f07ea7c3cbdae3c3a7 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -9,7 +9,7 @@
 #include "content/browser/android/android_browser_process.h"
 #include "content/browser/android/content_settings.h"
 #include "content/browser/android/content_view_client.h"
-#include "content/browser/android/content_view_impl.h"
+#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/download_controller.h"
 #include "content/browser/android/sandboxed_process_launcher.h"
 #include "content/browser/android/touch_point.h"
@@ -22,8 +22,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
     AndroidLocationApiAdapter::RegisterGeolocationService },
   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
   { "ContentSettings", content::ContentSettings::RegisterContentSettings },
-  { "ContentView", content::RegisterContentView },
   { "ContentViewClient", content::RegisterContentViewClient },
+  { "ContentViewCore", content::RegisterContentViewCore },
   { "DeviceInfo", content::RegisterDeviceInfo },
   { "DownloadController",
     content::DownloadController::RegisterDownloadController },