Remove text encoding UI

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 1321 matching lines @@
   return false;
 #endif
 }
 
 bool ChromeContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) {
   return !url.SchemeIs(chrome::kChromeNativeScheme);
 }
 
 std::string ChromeContentBrowserClient::GetCanonicalEncodingNameByAliasName(
     const std::string& alias_name) {
-  return CharacterEncoding::GetCanonicalEncodingNameByAliasName(alias_name);
+  return ::GetCanonicalEncodingNameByAliasName(alias_name);
 }
 
 namespace {
 
 bool IsAutoReloadEnabled() {
   // Fetch the field trial, even though we don't use it. Calling FindFullName()
   // causes the field-trial mechanism to report which group we're in, which
   // might reflect a hard disable or hard enable via flag, both of which have
   // their own field trial groups. This lets us know what percentage of users
   // manually enable or disable auto-reload.
@@ skipping 1052 matching lines @@
       prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
 #endif
 
 #if defined(OS_ANDROID)
   web_prefs->password_echo_enabled =
       prefs->GetBoolean(prefs::kWebKitPasswordEchoEnabled);
 #else
   web_prefs->password_echo_enabled = browser_defaults::kPasswordEchoEnabled;
 #endif
 
-  web_prefs->uses_universal_detector =
-      prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector);
+  web_prefs->uses_universal_detector = true;  // autodetection is always on.
   web_prefs->text_areas_are_resizable =
       prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
   web_prefs->hyperlink_auditing_enabled =
       prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
 
 #if defined(ENABLE_EXTENSIONS)
   std::string image_animation_policy =
       prefs->GetString(prefs::kAnimationPolicy);
   if (image_animation_policy == kAnimationPolicyOnce)
     web_prefs->animation_policy =
         content::IMAGE_ANIMATION_POLICY_ANIMATION_ONCE;
   else if (image_animation_policy == kAnimationPolicyNone)
     web_prefs->animation_policy = content::IMAGE_ANIMATION_POLICY_NO_ANIMATION;
   else
     web_prefs->animation_policy = content::IMAGE_ANIMATION_POLICY_ALLOWED;
 #endif
 
   // Make sure we will set the default_encoding with canonical encoding name.
-  web_prefs->default_encoding =
-      CharacterEncoding::GetCanonicalEncodingNameByAliasName(
+  web_prefs->default_encoding = GetCanonicalEncodingNameByAliasName(
           web_prefs->default_encoding);
   if (web_prefs->default_encoding.empty()) {
     prefs->ClearPref(prefs::kDefaultCharset);
     web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
   }
   DCHECK(!web_prefs->default_encoding.empty());
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePotentiallyAnnoyingSecurityFeatures)) {
     web_prefs->disable_reading_from_canvas = true;
@@ skipping 712 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)