Remove text encoding UI

chrome/browser/prefs/browser_prefs.cc

 // Copyright 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/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 621 matching lines @@
   registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false);
 #endif
 
   registry->RegisterBooleanPref(kCheckDefaultBrowser, true);
 
   registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref,
                                 false);
 
   registry->RegisterBooleanPref(kNetworkPredictionEnabled, true);
   registry->RegisterBooleanPref(kDisableSpdy, false);
+  registry->RegisterStringPref(prefs::kStaticEncodings, std::string());
+  registry->RegisterStringPref(prefs::kRecentlySelectedEncoding, std::string());
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
 #if defined(OS_CHROMEOS)
   chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
 #endif
 }
 
@@ skipping 80 matching lines @@
   }
   profile_prefs->ClearPref(kCheckDefaultBrowser);
 
   // Added 5/2016.
   profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
 
   // Added 7/2016.
   DeleteWebRTCIdentityStoreDB(profile);
   profile_prefs->ClearPref(kNetworkPredictionEnabled);
   profile_prefs->ClearPref(kDisableSpdy);
+
+  // Added 8/2016.
+  profile_prefs->ClearPref(prefs::kStaticEncodings);
+  profile_prefs->ClearPref(prefs::kRecentlySelectedEncoding);
 }
 
 }  // namespace chrome