Revert of [Android] Migrate javascript settings to a content setting from a pref.

chrome/browser/android/preferences/pref_service_bridge.cc

Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index 503815f61168b7777e535e8928935a6067c3d482..b0e8aecab6666a6c4c75c53ef503d7a894463d95 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -413,30 +413,20 @@
 }
 
 static void SetJavaScriptEnabled(JNIEnv* env, jobject obj, jboolean enabled) {
-  HostContentSettingsMap* host_content_settings_map =
-      GetOriginalProfile()->GetHostContentSettingsMap();
-  host_content_settings_map->SetDefaultContentSetting(
-      CONTENT_SETTINGS_TYPE_JAVASCRIPT,
-      enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
+  GetPrefService()->SetBoolean(prefs::kWebKitJavascriptEnabled, enabled);
 }
 
 static jboolean GetJavaScriptEnabled(JNIEnv* env, jobject obj) {
-  return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
-}
-
-static void MigrateJavascriptPreference(JNIEnv* env, jobject obj) {
-  const PrefService::Preference* javascript_pref =
-      GetPrefService()->FindPreference(prefs::kWebKitJavascriptEnabled);
-  DCHECK(javascript_pref);
-
-  if (!javascript_pref->HasUserSetting())
-    return;
-
-  bool javascript_enabled = false;
-  bool retval = javascript_pref->GetValue()->GetAsBoolean(&javascript_enabled);
-  DCHECK(retval);
-  SetJavaScriptEnabled(env, obj, javascript_enabled);
-  GetPrefService()->ClearPref(prefs::kWebKitJavascriptEnabled);
+  // The user pref for Javascript is stored in kWebKitJavascriptEnabled for
+  // historical reasons, but the content setting is where a possibly managed
+  // value will be enforced.
+  jboolean javascript_enabled =
+      GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
+  if (!GetJavaScriptManaged(env, obj)) {
+    javascript_enabled &= GetPrefService()->GetBoolean(
+        prefs::kWebKitJavascriptEnabled);
+  }
+  return javascript_enabled;
 }
 
 static void SetPasswordEchoEnabled(JNIEnv* env,