Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset…

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

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 06db8a93925687d7fa086a36421334f1bf8be374..e0a0607390612617c95ed77ae83274e097ed8a3f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -384,8 +384,6 @@ public class ContentViewCore
 
     private ContentViewClient mContentViewClient;
 
-    private ContentSettings mContentSettings;
-
     // Native pointer to C++ ContentViewCoreImpl object which will be set by nativeInit().
     private long mNativeContentViewCore = 0;
 
@@ -744,7 +742,6 @@ public class ContentViewCore
                 webContents, viewAndroidNativePointer, windowNativePointer,
                 mRetainedJavaScriptObjects);
         mWebContents = nativeGetWebContentsAndroid(mNativeContentViewCore);
-        mContentSettings = new ContentSettings(this, mNativeContentViewCore);
 
         setContainerViewInternals(internalDispatcher);
         mRenderCoordinates.reset();
@@ -957,7 +954,6 @@ public class ContentViewCore
         mWebContents = null;
         if (mViewAndroid != null) mViewAndroid.destroy();
         mNativeContentViewCore = 0;
-        mContentSettings = null;
         mJavaScriptInterfaces.clear();
         mRetainedJavaScriptObjects.clear();
         unregisterAccessibilityContentObserver();
@@ -1393,16 +1389,6 @@ public class ContentViewCore
         mWebContents.onHide();
     }
 
-    /**
-     * Return the ContentSettings object used to retrieve the settings for this
-     * ContentViewCore. For modifications, ChromeNativePreferences is to be used.
-     * @return A ContentSettings object that can be used to retrieve this
-     *         ContentViewCore's settings.
-     */
-    public ContentSettings getContentSettings() {
-        return mContentSettings;
-    }
-
     private void hidePopupsAndClearSelection() {
         mUnselectAllOnActionModeDismiss = true;
         hidePopups();
@@ -2846,7 +2832,7 @@ public class ContentViewCore
                 return false;
             }
 
-            if (!mContentSettings.getJavaScriptEnabled()) {
+            if (!mContentViewClient.isJavascriptEnabled()) {
                 return false;
             }