Android: turn on auto-detect encoding by default

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 <stddef.h>
 
 #include <memory>
@@ skipping 42 matching lines @@
 #include "components/metrics/metrics_pref_names.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/strings/grit/components_locale_settings.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/translate/core/common/translate_pref_names.h"
 #include "components/version_info/version_info.h"
 #include "components/web_resource/web_resource_pref_names.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/user_metrics.h"
 #include "jni/PrefServiceBridge_jni.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
@@ skipping 222 matching lines @@
 static jboolean GetTranslateEnabled(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kEnableTranslate);
 }
 
 static jboolean GetTranslateManaged(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj) {
   return GetPrefService()->IsManagedPreference(prefs::kEnableTranslate);
 }
 
-static jboolean GetAutoDetectEncodingEnabled(JNIEnv* env,
-                                             const JavaParamRef<jobject>& obj) {
-  return GetPrefService()->GetBoolean(prefs::kWebKitUsesUniversalDetector);
-}
-
 static jboolean GetSearchSuggestEnabled(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kSearchSuggestEnabled);
 }
 
 static jboolean GetSearchSuggestManaged(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   return GetPrefService()->IsManagedPreference(prefs::kSearchSuggestEnabled);
 }
 
@@ skipping 584 matching lines @@
   return ConvertUTF8ToJavaString(
       env, GetPrefService()->GetString(prefs::kGoogleServicesLastUsername));
 }
 
 static void SetTranslateEnabled(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 jboolean enabled) {
   GetPrefService()->SetBoolean(prefs::kEnableTranslate, enabled);
 }
 
-static void SetAutoDetectEncodingEnabled(JNIEnv* env,
-                                         const JavaParamRef<jobject>& obj,
-                                         jboolean enabled) {
-  content::RecordAction(base::UserMetricsAction("AutoDetectChange"));
-  GetPrefService()->SetBoolean(prefs::kWebKitUsesUniversalDetector, enabled);
-}
-
 static void ResetTranslateDefaults(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj) {
   std::unique_ptr<translate::TranslatePrefs> translate_prefs =
       ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
   translate_prefs->ResetToDefaults();
 }
 
 static void MigrateJavascriptPreference(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   const PrefService::Preference* javascript_pref =
@@ skipping 262 matching lines @@
 
   return ConvertJavaStringToUTF8(android_permission);
 }
 
 static void SetSupervisedUserId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kSupervisedUserId,
                               ConvertJavaStringToUTF8(env, pref));
 }