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

content/browser/android/content_settings.cc

Index: content/browser/android/content_settings.cc
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc
index 9ba1ad4c2c0f8b43cdd69b1a809441425575d1ec..1080658b5f457b344ab4bcb2777d3db05e2d55eb 100644
--- a/content/browser/android/content_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "content/browser/android/content_view_impl.h"
+#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/web_contents.h"
@@ -285,10 +285,10 @@ void ContentSettings::RenderViewCreated(RenderViewHost* render_view_host) {
 }
 
 jint Init(
-    JNIEnv* env, jobject obj, jint nativeContentView,
+    JNIEnv* env, jobject obj, jint nativeContentViewCore,
     jboolean is_master_mode) {
   WebContents* web_contents =
-      reinterpret_cast<ContentViewImpl*>(nativeContentView)
+      reinterpret_cast<ContentViewCoreImpl*>(nativeContentViewCore)
           ->web_contents();
   ContentSettings* content_settings =
       new ContentSettings(env, obj, web_contents, is_master_mode);