Refactor preference syncing.

chrome/browser/prefs/pref_service_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "app/test/data/resource.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ skipping 17 matching lines @@
 using testing::_;
 using testing::Mock;
 
 // TODO(port): port this test to POSIX.
 #if defined(OS_WIN)
 TEST(PrefServiceTest, LocalizedPrefs) {
   TestingPrefService prefs;
   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));
   EXPECT_EQ(1, prefs.GetInteger(kInteger));
   EXPECT_EQ("hello", prefs.GetString(kString));
 
   prefs.SetBoolean(kBoolean, true);
   EXPECT_TRUE(prefs.GetBoolean(kBoolean));
   prefs.SetInteger(kInteger, 5);
   EXPECT_EQ(5, prefs.GetInteger(kInteger));
   prefs.SetString(kString, "foo");
   EXPECT_EQ("foo", prefs.GetString(kString));
 }
 #endif
 
 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;
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs);
   registrar.Add(pref_name, &obs);
 
   // This should fire the checks in PrefObserverMock::Observe.
   const StringValue expected_value(new_pref_value);
   obs.Expect(&prefs, pref_name, &expected_value);
@@ skipping 21 matching lines @@
 TEST(PrefServiceTest, HasPrefPath) {
   TestingPrefService prefs;
 
   const char path[] = "fake.path";
 
   // Shouldn't initially have a path.
   EXPECT_FALSE(prefs.HasPrefPath(path));
 
   // 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.
   prefs.SetString(path, "blah");
   EXPECT_TRUE(prefs.HasPrefPath(path));
 }
 
 TEST(PrefServiceTest, Observers) {
   const char pref_name[] = "homepage";
 
   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);
   PrefObserverMock obs;
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs);
   registrar.Add(pref_name, &obs);
 
   // This should fire the checks in PrefObserverMock::Observe.
   obs.Expect(&prefs, pref_name, &expected_new_pref_value);
@@ skipping 20 matching lines @@
   prefs.SetString(pref_name, new_pref_value);
   Mock::VerifyAndClearExpectations(&obs);
   Mock::VerifyAndClearExpectations(&obs2);
 }
 
 // Make sure that if a preference changes type, so the wrong type is stored in
 // the user pref file, it uses the correct fallback value instead.
 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,
                     Value::CreateStringValue("not an integer"));
   const PrefService::Preference* pref =
       prefs.FindPreference(prefs::kStabilityLaunchCount);
   ASSERT_TRUE(pref);
   const Value* value = pref->GetValue();
   ASSERT_TRUE(value);
   EXPECT_EQ(Value::TYPE_INTEGER, value->GetType());
@@ skipping 190 matching lines @@
   TestingPrefService prefs_;
   PrefObserverMock observer_;
 };
 
 const char PrefServiceSetValueTest::kName[] = "name";
 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_);
   registrar.Add(kName, &observer_);
 
   // Changing the controlling store from default to user triggers notification.
   observer_.Expect(&prefs_, kName, &default_value);
   prefs_.Set(kName, default_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.Set(kName, default_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   StringValue new_value(kValue);
   observer_.Expect(&prefs_, kName, &new_value);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 }
 
 TEST_F(PrefServiceSetValueTest, SetDictionaryValue) {
-  prefs_.RegisterDictionaryPref(kName);
+  prefs_.RegisterDictionaryPref(kName, false /* don't sync pref */);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, &observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.RemoveUserPref(kName);
   Mock::VerifyAndClearExpectations(&observer_);
 
   DictionaryValue new_value;
   new_value.SetString(kName, kValue);
   observer_.Expect(&prefs_, kName, &new_value);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   DictionaryValue empty;
   observer_.Expect(&prefs_, kName, &empty);
   prefs_.Set(kName, empty);
   Mock::VerifyAndClearExpectations(&observer_);
 }
 
 TEST_F(PrefServiceSetValueTest, SetListValue) {
-  prefs_.RegisterListPref(kName);
+  prefs_.RegisterListPref(kName, false /* don't sync pref */);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, &observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.RemoveUserPref(kName);
   Mock::VerifyAndClearExpectations(&observer_);
 
   ListValue new_value;
   new_value.Append(Value::CreateStringValue(kValue));
   observer_.Expect(&prefs_, kName, &new_value);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   ListValue empty;
   observer_.Expect(&prefs_, kName, &empty);
   prefs_.Set(kName, empty);
   Mock::VerifyAndClearExpectations(&observer_);
 }