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

content/public/android/java/src/org/chromium/content/browser/ContentSettings.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java b/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
index 3aa627a1519e11bcca16e2c906cad78964271d4d..f191230e69840bdb638cc65a4079f7573b37c8b0 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentSettings.java
@@ -29,7 +29,7 @@ public class ContentSettings {
 
     private int mNativeContentSettings = 0;
 
-    private ContentView mContentView;
+    private ContentViewCore mContentViewCore;
 
     // When ContentView is used in PERSONALITY_CHROME mode, settings can't
     // be modified through the ContentSettings instance.
@@ -84,7 +84,7 @@ public class ContentSettings {
         private Handler mHandler;
 
         EventHandler() {
-            mHandler = mContentView.isPersonalityView() ?
+            mHandler = mContentViewCore.isPersonalityView() ?
                     new Handler() {
                         @Override
                         public void handleMessage(Message msg) {
@@ -96,13 +96,13 @@ public class ContentSettings {
                                     }
                                     break;
                                 case UPDATE_UA:
-                                    synchronized (mContentView) {
-                                        mContentView.setAllUserAgentOverridesInHistory();
+                                    synchronized (mContentViewCore) {
+                                        mContentViewCore.setAllUserAgentOverridesInHistory();
                                     }
                                     break;
                                 case UPDATE_MULTI_TOUCH:
-                                    synchronized (mContentView) {
-                                        mContentView.updateMultiTouchZoomSupport();
+                                    synchronized (mContentViewCore) {
+                                        mContentViewCore.updateMultiTouchZoomSupport();
                                     }
                                     break;
                             }
@@ -140,10 +140,10 @@ public class ContentSettings {
      * Package constructor to prevent clients from creating a new settings
      * instance. Must be called on the UI thread.
      */
-    ContentSettings(ContentView contentView, int nativeContentView) {
+    ContentSettings(ContentViewCore contentViewCore, int nativeContentView) {
         ThreadUtils.assertOnUiThread();
-        mContentView = contentView;
-        mCanModifySettings = mContentView.isPersonalityView();
+        mContentViewCore = contentViewCore;
+        mCanModifySettings = mContentViewCore.isPersonalityView();
         mNativeContentSettings = nativeInit(nativeContentView, mCanModifySettings);
         assert mNativeContentSettings != 0;