Refactor preference syncing.

chrome/browser/prefs/pref_service_unittest.cc

Index: chrome/browser/prefs/pref_service_unittest.cc
diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc
index 496e9de1560ba24983ee147af602d09552372e96..1225b1debca4a25701d527bcf84bcbb9ad284431 100644
--- a/chrome/browser/prefs/pref_service_unittest.cc
+++ b/chrome/browser/prefs/pref_service_unittest.cc
@@ -35,9 +35,15 @@ TEST(PrefServiceTest, LocalizedPrefs) {
   const char kBoolean[] = "boolean";
   const char kInteger[] = "integer";
   const char kString[] = "string";
-  prefs.RegisterLocalizedBooleanPref(kBoolean, IDS_LOCALE_BOOL);
-  prefs.RegisterLocalizedIntegerPref(kInteger, IDS_LOCALE_INT);
-  prefs.RegisterLocalizedStringPref(kString, IDS_LOCALE_STRING);
+  prefs.RegisterLocalizedBooleanPref(kBoolean,
+                                     IDS_LOCALE_BOOL,
+                                     false /* don't sync pref */);
+  prefs.RegisterLocalizedIntegerPref(kInteger,
+                                     IDS_LOCALE_INT,
+                                     false /* don't sync pref */);
+  prefs.RegisterLocalizedStringPref(kString,
+                                    IDS_LOCALE_STRING,
+                                    false /* don't sync pref */);
 
   // The locale default should take preference over the user default.
   EXPECT_FALSE(prefs.GetBoolean(kBoolean));
@@ -57,7 +63,9 @@ TEST(PrefServiceTest, NoObserverFire) {
   TestingPrefService prefs;
 
   const char pref_name[] = "homepage";
-  prefs.RegisterStringPref(pref_name, std::string());
+  prefs.RegisterStringPref(pref_name,
+                           std::string(),
+                           false /* don't sync pref */);
 
   const char new_pref_value[] = "http://www.google.com/";
   PrefObserverMock obs;
@@ -99,7 +107,7 @@ TEST(PrefServiceTest, HasPrefPath) {
 
   // Register the path. This doesn't set a value, so the path still shouldn't
   // exist.
-  prefs.RegisterStringPref(path, std::string());
+  prefs.RegisterStringPref(path, std::string(), false /* don't sync pref */);
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // Set a value and make sure we have a path.
@@ -112,7 +120,9 @@ TEST(PrefServiceTest, Observers) {
 
   TestingPrefService prefs;
   prefs.SetUserPref(pref_name, Value::CreateStringValue("http://www.cnn.com"));
-  prefs.RegisterStringPref(pref_name, std::string());
+  prefs.RegisterStringPref(pref_name,
+                           std::string(),
+                           false /* don't sync pref */);
 
   const char new_pref_value[] = "http://www.google.com/";
   const StringValue expected_new_pref_value(new_pref_value);
@@ -153,7 +163,9 @@ TEST(PrefServiceTest, Observers) {
 TEST(PrefServiceTest, GetValueChangedType) {
   const int kTestValue = 10;
   TestingPrefService prefs;
-  prefs.RegisterIntegerPref(prefs::kStabilityLaunchCount, kTestValue);
+  prefs.RegisterIntegerPref(prefs::kStabilityLaunchCount,
+                            kTestValue,
+                            false /* don't sync pref */);
 
   // Check falling back to a recommended value.
   prefs.SetUserPref(prefs::kStabilityLaunchCount,
@@ -364,7 +376,9 @@ const char PrefServiceSetValueTest::kValue[] = "value";
 TEST_F(PrefServiceSetValueTest, SetStringValue) {
   const char default_string[] = "default";
   const StringValue default_value(default_string);
-  prefs_.RegisterStringPref(kName, default_string);
+  prefs_.RegisterStringPref(kName,
+                            default_string,
+                            false /* don't sync pref */);
 
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
@@ -386,7 +400,7 @@ TEST_F(PrefServiceSetValueTest, SetStringValue) {
 }
 
 TEST_F(PrefServiceSetValueTest, SetDictionaryValue) {
-  prefs_.RegisterDictionaryPref(kName);
+  prefs_.RegisterDictionaryPref(kName, false /* don't sync pref */);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, &observer_);
@@ -412,7 +426,7 @@ TEST_F(PrefServiceSetValueTest, SetDictionaryValue) {
 }
 
 TEST_F(PrefServiceSetValueTest, SetListValue) {
-  prefs_.RegisterListPref(kName);
+  prefs_.RegisterListPref(kName, false /* don't sync pref */);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, &observer_);