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

content/browser/android/content_settings.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 "content/browser/android/content_settings.h"
 
 #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"
 #include "jni/content_settings_jni.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF16;
@@ skipping 258 matching lines @@
 void ContentSettings::SyncToNative(JNIEnv* env, jobject obj) {
   SyncToNativeImpl();
 }
 
 void ContentSettings::RenderViewCreated(RenderViewHost* render_view_host) {
   if (is_master_mode_)
     SyncToNativeImpl();
 }
 
 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);
   return reinterpret_cast<jint>(content_settings);
 }
 
 jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   // "Version/4.0" had been hardcoded in the legacy WebView.
   std::string ua = webkit_glue::BuildUserAgentFromProduct("Version/4.0");
   return base::android::ConvertUTF8ToJavaString(env, ua).Release();
 }
 
 }  // namespace content