Componentize Chrome terms of service, Accept-Languages & default encoding.

ios/chrome/browser/prefs/browser_prefs.mm

Index: ios/chrome/browser/prefs/browser_prefs.mm
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index 0ec7861a0cd541879c687f4421e3243c4ffc6c8f..aafd2e14006f363be7f19312844fb8fb74159524 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -20,6 +20,7 @@
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/ssl_config/ssl_config_service_manager.h"
+#include "components/strings/grit/components_locale_settings.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/translate/core/common/translate_pref_names.h"
@@ -34,7 +35,6 @@
 #include "ios/chrome/browser/net/http_server_properties_manager_factory.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
-#include "ios/chrome/grit/ios_locale_settings.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -101,13 +101,11 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kEnableTranslate, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterStringPref(
-      prefs::kAcceptLanguages,
-      l10n_util::GetStringUTF8(IDS_IOS_ACCEPT_LANGUAGES));
-  registry->RegisterStringPref(
-      prefs::kDefaultCharset,
-      l10n_util::GetStringUTF8(IDS_IOS_DEFAULT_ENCODING),
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterStringPref(prefs::kAcceptLanguages,
+                               l10n_util::GetStringUTF8(IDS_ACCEPT_LANGUAGES));
+  registry->RegisterStringPref(prefs::kDefaultCharset,
+                               l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING),
+                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterInt64Pref(prefs::kRateThisAppDialogLastShownTime, 0,
                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(