Remove text encoding UI

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 31a892c3977c3afa483701c01f2b8cb88cace806..4a6d32f78540b9cb4e267c6d511043a233c2882c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -639,6 +639,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   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) {
@@ -739,6 +741,10 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
   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