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

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 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 "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 395 matching lines @@
   scoped_ptr<translate::TranslatePrefs> translate_prefs =
       ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
   translate_prefs->ResetToDefaults();
 }
 
 static jboolean GetJavaScriptManaged(JNIEnv* env, jobject obj) {
   return IsContentSettingManaged(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 }
 
 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,
                                    jobject obj,
                                    jboolean passwordEchoEnabled) {
   GetPrefService()->SetBoolean(prefs::kWebKitPasswordEchoEnabled,
                                passwordEchoEnabled);
 }
 
 static jboolean GetAllowPopupsEnabled(JNIEnv* env, jobject obj) {
@@ skipping 258 matching lines @@
                                                                jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
       GetPrefService()->GetString(
           prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 bool RegisterPrefServiceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }