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

android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
index 6bcbd446491a9bf1aa055bf23ab8e3ded99dbf2b..146bcc6a64951330597143e2a3157eba06695b93 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
@@ -18,7 +18,6 @@ import org.chromium.android_webview.AwContentsClient;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.base.test.util.InMemorySharedPreferences;
-import org.chromium.content.browser.ContentSettings;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -392,16 +391,6 @@ public class AwTestBase
         });
     }
 
-    public ContentSettings getContentSettingsOnUiThread(
-            final AwContents awContents) throws Exception {
-        return runTestOnUiThreadAndGetResult(new Callable<ContentSettings>() {
-            @Override
-            public ContentSettings call() throws Exception {
-                return awContents.getContentViewCore().getContentSettings();
-            }
-        });
-    }
-
     public AwSettings getAwSettingsOnUiThread(
             final AwContents awContents) throws Exception {
         return runTestOnUiThreadAndGetResult(new Callable<AwSettings>() {