Refactor preference syncing.

chrome/browser/content_settings/content_settings_pref_provider.cc

Index: chrome/browser/content_settings/content_settings_pref_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index 841b281dddea2d78e880694d1858d9e9429a47f8..ebc87d2c9c6a103ea6c19b684c6bb7b2413145ab 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -313,12 +313,14 @@ void PrefDefaultProvider::RegisterUserPrefs(PrefService* prefs) {
   DictionaryValue* default_content_settings = new DictionaryValue();
   SetDefaultContentSettings(default_content_settings);
   prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings,
-                                default_content_settings);
+                                default_content_settings,
+                                true /* sync pref */);
 
   // Obsolete prefs, for migrations:
   prefs->RegisterIntegerPref(
       prefs::kDesktopNotificationDefaultContentSetting,
-          kDefaultSettings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS]);
+      kDefaultSettings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS],
+      true /* sync pref */);
 }
 
 // ////////////////////////////////////////////////////////////////////////////
@@ -327,13 +329,18 @@ void PrefDefaultProvider::RegisterUserPrefs(PrefService* prefs) {
 
 // static
 void PrefProvider::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterIntegerPref(prefs::kContentSettingsVersion,
-      ContentSettingsPattern::kContentSettingsPatternVersion);
-  prefs->RegisterDictionaryPref(prefs::kContentSettingsPatterns);
+  prefs->RegisterIntegerPref(
+      prefs::kContentSettingsVersion,
+      ContentSettingsPattern::kContentSettingsPatternVersion,
+      false /* don't sync pref */);
+  prefs->RegisterDictionaryPref(prefs::kContentSettingsPatterns,
+                                true /* sync pref */);
 
   // Obsolete prefs, for migration:
-  prefs->RegisterListPref(prefs::kPopupWhitelistedHosts);
-  prefs->RegisterDictionaryPref(prefs::kPerHostContentSettings);
+  prefs->RegisterListPref(prefs::kPopupWhitelistedHosts,
+                          false /* don't sync pref */);
+  prefs->RegisterDictionaryPref(prefs::kPerHostContentSettings,
+                                false /* don't sync pref */);
 }
 
 PrefProvider::PrefProvider(Profile* profile)