Introduce incognito preference settings.

chrome/browser/prefs/pref_member_unittest.cc

Index: chrome/browser/prefs/pref_member_unittest.cc
diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc
index 986fc69df877a8a9b6fb576adc510d4970aa25ac..2dbbac6e831de0be903735a45bd0660efa034bac 100644
--- a/chrome/browser/prefs/pref_member_unittest.cc
+++ b/chrome/browser/prefs/pref_member_unittest.cc
@@ -51,103 +51,105 @@ class PrefMemberTestClass : public NotificationObserver {
 }  // anonymous namespace
 
 TEST(PrefMemberTest, BasicGetAndSet) {
-  TestingPrefService prefs;
-  RegisterTestPrefs(&prefs);
+  scoped_ptr<TestingPrefService> prefs(
+      TestingPrefService::CreateTestingPrefService());
+  RegisterTestPrefs(prefs.get());
 
   // Test bool
   BooleanPrefMember boolean;
-  boolean.Init(kBoolPref, &prefs, NULL);
+  boolean.Init(kBoolPref, prefs.get(), NULL);
 
   // Check the defaults
-  EXPECT_FALSE(prefs.GetBoolean(kBoolPref));
+  EXPECT_FALSE(prefs->GetBoolean(kBoolPref));
   EXPECT_FALSE(boolean.GetValue());
   EXPECT_FALSE(*boolean);
 
   // Try changing through the member variable.
   boolean.SetValue(true);
   EXPECT_TRUE(boolean.GetValue());
-  EXPECT_TRUE(prefs.GetBoolean(kBoolPref));
+  EXPECT_TRUE(prefs->GetBoolean(kBoolPref));
   EXPECT_TRUE(*boolean);
 
   // Try changing back through the pref.
-  prefs.SetBoolean(kBoolPref, false);
-  EXPECT_FALSE(prefs.GetBoolean(kBoolPref));
+  prefs->SetBoolean(kBoolPref, false);
+  EXPECT_FALSE(prefs->GetBoolean(kBoolPref));
   EXPECT_FALSE(boolean.GetValue());
   EXPECT_FALSE(*boolean);
 
   // Test int
   IntegerPrefMember integer;
-  integer.Init(kIntPref, &prefs, NULL);
+  integer.Init(kIntPref, prefs.get(), NULL);
 
   // Check the defaults
-  EXPECT_EQ(0, prefs.GetInteger(kIntPref));
+  EXPECT_EQ(0, prefs->GetInteger(kIntPref));
   EXPECT_EQ(0, integer.GetValue());
   EXPECT_EQ(0, *integer);
 
   // Try changing through the member variable.
   integer.SetValue(5);
   EXPECT_EQ(5, integer.GetValue());
-  EXPECT_EQ(5, prefs.GetInteger(kIntPref));
+  EXPECT_EQ(5, prefs->GetInteger(kIntPref));
   EXPECT_EQ(5, *integer);
 
   // Try changing back through the pref.
-  prefs.SetInteger(kIntPref, 2);
-  EXPECT_EQ(2, prefs.GetInteger(kIntPref));
+  prefs->SetInteger(kIntPref, 2);
+  EXPECT_EQ(2, prefs->GetInteger(kIntPref));
   EXPECT_EQ(2, integer.GetValue());
   EXPECT_EQ(2, *integer);
 
   // Test real (double)
   RealPrefMember real;
-  real.Init(kRealPref, &prefs, NULL);
+  real.Init(kRealPref, prefs.get(), NULL);
 
   // Check the defaults
-  EXPECT_EQ(0.0, prefs.GetReal(kRealPref));
+  EXPECT_EQ(0.0, prefs->GetReal(kRealPref));
   EXPECT_EQ(0.0, real.GetValue());
   EXPECT_EQ(0.0, *real);
 
   // Try changing through the member variable.
   real.SetValue(1.0);
   EXPECT_EQ(1.0, real.GetValue());
-  EXPECT_EQ(1.0, prefs.GetReal(kRealPref));
+  EXPECT_EQ(1.0, prefs->GetReal(kRealPref));
   EXPECT_EQ(1.0, *real);
 
   // Try changing back through the pref.
-  prefs.SetReal(kRealPref, 3.0);
-  EXPECT_EQ(3.0, prefs.GetReal(kRealPref));
+  prefs->SetReal(kRealPref, 3.0);
+  EXPECT_EQ(3.0, prefs->GetReal(kRealPref));
   EXPECT_EQ(3.0, real.GetValue());
   EXPECT_EQ(3.0, *real);
 
   // Test string
   StringPrefMember string;
-  string.Init(kStringPref, &prefs, NULL);
+  string.Init(kStringPref, prefs.get(), NULL);
 
   // Check the defaults
-  EXPECT_EQ("default", prefs.GetString(kStringPref));
+  EXPECT_EQ("default", prefs->GetString(kStringPref));
   EXPECT_EQ("default", string.GetValue());
   EXPECT_EQ("default", *string);
 
   // Try changing through the member variable.
   string.SetValue("foo");
   EXPECT_EQ("foo", string.GetValue());
-  EXPECT_EQ("foo", prefs.GetString(kStringPref));
+  EXPECT_EQ("foo", prefs->GetString(kStringPref));
   EXPECT_EQ("foo", *string);
 
   // Try changing back through the pref.
-  prefs.SetString(kStringPref, "bar");
-  EXPECT_EQ("bar", prefs.GetString(kStringPref));
+  prefs->SetString(kStringPref, "bar");
+  EXPECT_EQ("bar", prefs->GetString(kStringPref));
   EXPECT_EQ("bar", string.GetValue());
   EXPECT_EQ("bar", *string);
 }
 
 TEST(PrefMemberTest, TwoPrefs) {
   // Make sure two RealPrefMembers stay in sync.
-  TestingPrefService prefs;
-  RegisterTestPrefs(&prefs);
+  scoped_ptr<TestingPrefService> prefs(
+      TestingPrefService::CreateTestingPrefService());
+  RegisterTestPrefs(prefs.get());
 
   RealPrefMember pref1;
-  pref1.Init(kRealPref, &prefs, NULL);
+  pref1.Init(kRealPref, prefs.get(), NULL);
   RealPrefMember pref2;
-  pref2.Init(kRealPref, &prefs, NULL);
+  pref2.Init(kRealPref, prefs.get(), NULL);
 
   pref1.SetValue(2.3);
   EXPECT_EQ(2.3, *pref2);
@@ -155,36 +157,37 @@ TEST(PrefMemberTest, TwoPrefs) {
   pref2.SetValue(3.5);
   EXPECT_EQ(3.5, *pref1);
 
-  prefs.SetReal(kRealPref, 4.2);
+  prefs->SetReal(kRealPref, 4.2);
   EXPECT_EQ(4.2, *pref1);
   EXPECT_EQ(4.2, *pref2);
 }
 
 TEST(PrefMemberTest, Observer) {
-  TestingPrefService prefs;
-  RegisterTestPrefs(&prefs);
+  scoped_ptr<TestingPrefService> prefs(
+      TestingPrefService::CreateTestingPrefService());
+  RegisterTestPrefs(prefs.get());
 
-  PrefMemberTestClass test_obj(&prefs);
+  PrefMemberTestClass test_obj(prefs.get());
   EXPECT_EQ("default", *test_obj.str_);
 
   // Calling SetValue should not fire the observer.
   test_obj.str_.SetValue("hello");
   EXPECT_EQ(0, test_obj.observe_cnt_);
-  EXPECT_EQ("hello", prefs.GetString(kStringPref));
+  EXPECT_EQ("hello", prefs->GetString(kStringPref));
 
   // Changing the pref does fire the observer.
-  prefs.SetString(kStringPref, "world");
+  prefs->SetString(kStringPref, "world");
   EXPECT_EQ(1, test_obj.observe_cnt_);
   EXPECT_EQ("world", *(test_obj.str_));
 
   // Not changing the value should not fire the observer.
-  prefs.SetString(kStringPref, "world");
+  prefs->SetString(kStringPref, "world");
   EXPECT_EQ(1, test_obj.observe_cnt_);
   EXPECT_EQ("world", *(test_obj.str_));
 
-  prefs.SetString(kStringPref, "hello");
+  prefs->SetString(kStringPref, "hello");
   EXPECT_EQ(2, test_obj.observe_cnt_);
-  EXPECT_EQ("hello", prefs.GetString(kStringPref));
+  EXPECT_EQ("hello", prefs->GetString(kStringPref));
 }
 
 TEST(PrefMemberTest, NoInit) {