components: Move PrefRegistrySyncable into user_prefs namespace.

chrome/browser/ui/prefs/prefs_tab_helper.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/ui/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/pref_service.h"
@@ skipping 23 matching lines @@
 #include "chrome/browser/themes/theme_service_factory.h"
 #endif
 
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PrefsTabHelper);
 
 namespace {
 
 // Registers prefs only used for migration.
-void RegisterPrefsToMigrate(PrefRegistrySyncable* prefs) {
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitOldStandardFontFamily,
-                                     IDS_STANDARD_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFixedFontFamily,
-                                     IDS_FIXED_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSerifFontFamily,
-                                     IDS_SERIF_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSansSerifFontFamily,
-                                     IDS_SANS_SERIF_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitOldCursiveFontFamily,
-                                     IDS_CURSIVE_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFantasyFontFamily,
-                                     IDS_FANTASY_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kGlobalDefaultCharset,
-                                     IDS_DEFAULT_ENCODING,
-                                     PrefRegistrySyncable::SYNCABLE_PREF);
-  prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFontSize,
-                                      IDS_DEFAULT_FONT_SIZE,
-                                      PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFixedFontSize,
-                                      IDS_DEFAULT_FIXED_FONT_SIZE,
-                                      PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalMinimumFontSize,
-                                      IDS_MINIMUM_FONT_SIZE,
-                                      PrefRegistrySyncable::UNSYNCABLE_PREF);
+void RegisterPrefsToMigrate(user_prefs::PrefRegistrySyncable* prefs) {
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitOldStandardFontFamily,
+      IDS_STANDARD_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitOldFixedFontFamily,
+      IDS_FIXED_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitOldSerifFontFamily,
+      IDS_SERIF_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitOldSansSerifFontFamily,
+      IDS_SANS_SERIF_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitOldCursiveFontFamily,
+      IDS_CURSIVE_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitOldFantasyFontFamily,
+      IDS_FANTASY_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kGlobalDefaultCharset,
+      IDS_DEFAULT_ENCODING,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  prefs->RegisterLocalizedIntegerPref(
+      prefs::kWebKitGlobalDefaultFontSize,
+      IDS_DEFAULT_FONT_SIZE,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedIntegerPref(
+      prefs::kWebKitGlobalDefaultFixedFontSize,
+      IDS_DEFAULT_FIXED_FONT_SIZE,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedIntegerPref(
+      prefs::kWebKitGlobalMinimumFontSize,
+      IDS_MINIMUM_FONT_SIZE,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedIntegerPref(
       prefs::kWebKitGlobalMinimumLogicalFontSize,
       IDS_MINIMUM_LOGICAL_FONT_SIZE,
-      PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalStandardFontFamily,
-                                     IDS_STANDARD_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFixedFontFamily,
-                                     IDS_FIXED_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSerifFontFamily,
-                                     IDS_SERIF_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSansSerifFontFamily,
-                                     IDS_SANS_SERIF_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalCursiveFontFamily,
-                                     IDS_CURSIVE_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFantasyFontFamily,
-                                     IDS_FANTASY_FONT_FAMILY,
-                                     PrefRegistrySyncable::UNSYNCABLE_PREF);
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitGlobalStandardFontFamily,
+      IDS_STANDARD_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitGlobalFixedFontFamily,
+      IDS_FIXED_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitGlobalSerifFontFamily,
+      IDS_SERIF_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitGlobalSansSerifFontFamily,
+      IDS_SANS_SERIF_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitGlobalCursiveFontFamily,
+      IDS_CURSIVE_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(
+      prefs::kWebKitGlobalFantasyFontFamily,
+      IDS_FANTASY_FONT_FAMILY,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // The list of prefs we want to observe.
 const char* kPrefsToObserve[] = {
   prefs::kDefaultCharset,
   prefs::kWebKitAllowDisplayingInsecureContent,
   prefs::kWebKitAllowRunningInsecureContent,
   prefs::kWebKitDefaultFixedFontSize,
   prefs::kWebKitDefaultFontSize,
 #if defined(OS_ANDROID)
@@ skipping 11 matching lines @@
 };
 
 const int kPrefsToObserveLength = arraysize(kPrefsToObserve);
 
 // Registers a preference under the path |pref_name| for each script used for
 // per-script font prefs.
 // For example, for WEBKIT_WEBPREFS_FONTS_SERIF ("fonts.serif"):
 // "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered.
 // |fonts_with_defaults| contains all |pref_names| already registered since they
 // have a specified default value.
-void RegisterFontFamilyPrefs(PrefRegistrySyncable* registry,
+void RegisterFontFamilyPrefs(user_prefs::PrefRegistrySyncable* registry,
                              const std::set<std::string>& fonts_with_defaults) {
 
   // Expand the font concatenated with script name so this stays at RO memory
   // rather than allocated in heap.
   static const char* const kFontFamilyMap[] = {
 #define EXPAND_SCRIPT_FONT(map_name, script_name) map_name "." script_name,
 
 #include "chrome/common/pref_font_script_names-inl.h"
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_CURSIVE)
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_FANTASY)
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_FIXED)
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_PICTOGRAPH)
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_SANSERIF)
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_SERIF)
 ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_STANDARD)
 
 #undef EXPAND_SCRIPT_FONT
   };
 
   for (size_t i = 0; i < arraysize(kFontFamilyMap); ++i) {
     const char* pref_name = kFontFamilyMap[i];
     if (fonts_with_defaults.find(pref_name) == fonts_with_defaults.end()) {
       // We haven't already set a default value for this font preference, so set
       // an empty string as the default.
       registry->RegisterStringPref(
-          pref_name, std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
+          pref_name,
+          std::string(),
+          user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
     }
   }
 }
 
 #if !defined(OS_ANDROID)
 // Registers |obs| to observe per-script font prefs under the path |map_name|.
 // On android, there's no exposed way to change these prefs, so we can save
 // ~715KB of heap and some startup cycles by avoiding observing these prefs
 // since they will never change.
 void RegisterFontFamilyMapObserver(
@@ skipping 305 matching lines @@
   // List of keys that cannot be changed in the user prefs file by the incognito
   // profile.  All preferences that store information about the browsing history
   // or behavior of the user should have this property.
   pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement);
 #if defined(OS_ANDROID) || defined(OS_IOS)
   pref_store->RegisterOverlayPref(prefs::kProxy);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 
 // static
-void PrefsTabHelper::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+void PrefsTabHelper::RegisterUserPrefs(
+    user_prefs::PrefRegistrySyncable* registry) {
   WebPreferences pref_defaults;
-  registry->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
-                                pref_defaults.javascript_enabled,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
-                                pref_defaults.web_security_enabled,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitJavascriptEnabled,
+      pref_defaults.javascript_enabled,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitWebSecurityEnabled,
+      pref_defaults.web_security_enabled,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kWebKitJavascriptCanOpenWindowsAutomatically,
       true,
-      PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
-                                pref_defaults.loads_images_automatically,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
-                                pref_defaults.plugins_enabled,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
-                                pref_defaults.dom_paste_enabled,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit,
-                                pref_defaults.shrinks_standalone_images_to_fit,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterDictionaryPref(prefs::kWebKitInspectorSettings,
-                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
-                                pref_defaults.text_areas_are_resizable,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
-                                pref_defaults.java_enabled,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebkitTabsToLinks,
-                                pref_defaults.tabs_to_links,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent,
-                                false,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent,
-                                true,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kEnableReferrers,
-                                true,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitLoadsImagesAutomatically,
+      pref_defaults.loads_images_automatically,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitPluginsEnabled,
+      pref_defaults.plugins_enabled,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitDomPasteEnabled,
+      pref_defaults.dom_paste_enabled,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitShrinksStandaloneImagesToFit,
+      pref_defaults.shrinks_standalone_images_to_fit,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDictionaryPref(
+      prefs::kWebKitInspectorSettings,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitTextAreasAreResizable,
+      pref_defaults.text_areas_are_resizable,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitJavaEnabled,
+      pref_defaults.java_enabled,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebkitTabsToLinks,
+      pref_defaults.tabs_to_links,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitAllowRunningInsecureContent,
+      false,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitAllowDisplayingInsecureContent,
+      true,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kEnableReferrers,
+      true,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #if defined(OS_ANDROID)
-  registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor,
-                               pref_defaults.font_scale_factor,
-                               PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom,
-                                pref_defaults.force_enable_zoom,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDoublePref(
+      prefs::kWebKitFontScaleFactor,
+      pref_defaults.font_scale_factor,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterBooleanPref(
+      prefs::kWebKitForceEnableZoom,
+      pref_defaults.force_enable_zoom,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 
 #if !defined(OS_MACOSX)
-  registry->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
-                                        IDS_ACCEPT_LANGUAGES,
-                                        PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterLocalizedStringPref(
+      prefs::kAcceptLanguages,
+      IDS_ACCEPT_LANGUAGES,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #else
   // Not used in OSX.
-  registry->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
-                                        IDS_ACCEPT_LANGUAGES,
-                                        PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterLocalizedStringPref(
+      prefs::kAcceptLanguages,
+      IDS_ACCEPT_LANGUAGES,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
-  registry->RegisterLocalizedStringPref(prefs::kDefaultCharset,
-                                        IDS_DEFAULT_ENCODING,
-                                        PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterLocalizedStringPref(
+      prefs::kDefaultCharset,
+      IDS_DEFAULT_ENCODING,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
   // Register font prefs that have defaults.
   std::set<std::string> fonts_with_defaults;
   UScriptCode browser_script = GetScriptOfBrowserLocale();
   for (size_t i = 0; i < kFontDefaultsLength; ++i) {
     const FontDefault& pref = kFontDefaults[i];
     UScriptCode pref_script = GetScriptOfFontPref(pref.pref_name);
 
     // Suppress this default font pref value if it is for the primary script of
     // the browser's UI locale.  For example, if the pref is for the sans-serif
     // font for the Cyrillic script, and the browser locale is "ru" (Russian),
     // the default is suppressed.  Otherwise, the default would override the
     // user's font preferences when viewing pages in their native language.
     // This is because users have no way yet of customizing their per-script
     // font preferences.  The font prefs accessible in the options UI are for
     // the default, unknown script; these prefs have less priority than the
     // per-script font prefs when the script of the content is known.  This code
     // can possibly be removed later if users can easily access per-script font
     // prefs (e.g., via the extensions workflow), or the problem turns out to
     // not be really critical after all.
     if (browser_script != pref_script) {
       registry->RegisterLocalizedStringPref(
           pref.pref_name,
           pref.resource_id,
-          PrefRegistrySyncable::UNSYNCABLE_PREF);
+          user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
       fonts_with_defaults.insert(pref.pref_name);
     }
   }
 
   // Register font prefs that don't have defaults.
   RegisterFontFamilyPrefs(registry, fonts_with_defaults);
 
-  registry->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize,
-                                         IDS_DEFAULT_FONT_SIZE,
-                                         PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFixedFontSize,
-                                         IDS_DEFAULT_FIXED_FONT_SIZE,
-                                         PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumFontSize,
-                                         IDS_MINIMUM_FONT_SIZE,
-                                         PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterLocalizedIntegerPref(
+      prefs::kWebKitDefaultFontSize,
+      IDS_DEFAULT_FONT_SIZE,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterLocalizedIntegerPref(
+      prefs::kWebKitDefaultFixedFontSize,
+      IDS_DEFAULT_FIXED_FONT_SIZE,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterLocalizedIntegerPref(
+      prefs::kWebKitMinimumFontSize,
+      IDS_MINIMUM_FONT_SIZE,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterLocalizedIntegerPref(
       prefs::kWebKitMinimumLogicalFontSize,
       IDS_MINIMUM_LOGICAL_FONT_SIZE,
-      PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterLocalizedBooleanPref(prefs::kWebKitUsesUniversalDetector,
-                                         IDS_USES_UNIVERSAL_DETECTOR,
-                                         PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterLocalizedStringPref(prefs::kStaticEncodings,
-                                        IDS_STATIC_ENCODING_LIST,
-                                        PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterStringPref(prefs::kRecentlySelectedEncoding,
-                               std::string(),
-                               PrefRegistrySyncable::UNSYNCABLE_PREF);
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterLocalizedBooleanPref(
+      prefs::kWebKitUsesUniversalDetector,
+      IDS_USES_UNIVERSAL_DETECTOR,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterLocalizedStringPref(
+      prefs::kStaticEncodings,
+      IDS_STATIC_ENCODING_LIST,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      prefs::kRecentlySelectedEncoding,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   RegisterPrefsToMigrate(registry);
 }
 
 void PrefsTabHelper::MigrateUserPrefs(PrefService* prefs) {
   for (int i = 0; i < kPrefsToMigrateLength; ++i) {
     const PrefService::Preference* pref =
         prefs->FindPreference(kPrefNamesToMigrate[i].from);
     if (pref && !pref->IsDefaultValue()) {
       prefs->Set(kPrefNamesToMigrate[i].to, *pref->GetValue());
@@ skipping 67 matching lines @@
       WebPreferences web_prefs =
           web_contents_->GetRenderViewHost()->GetWebkitPreferences();
       OverrideFontFamily(&web_prefs, generic_family, script, std::string());
       web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
       return;
     }
   }
 
   UpdateWebPreferences();
 }