Introduce incognito preference settings.

chrome/browser/about_flags_unittest.cc

Index: chrome/browser/about_flags_unittest.cc
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index c3bbe95bff1fad361a51bb1d15b53862312bc5b4..64afbcf4e45ee271bda07369f49217fdffe94c20 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -77,12 +77,13 @@ static Experiment kExperiments[] = {
 
 class AboutFlagsTest : public ::testing::Test {
  protected:
-  AboutFlagsTest() {
-    prefs_.RegisterListPref(prefs::kEnabledLabsExperiments);
+  AboutFlagsTest()
+      : prefs_(TestingPrefService::CreateTestingPrefService()) {
+    prefs_->RegisterListPref(prefs::kEnabledLabsExperiments);
 #if defined(OS_CHROMEOS)
-    prefs_.RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false);
-    prefs_.RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, false);
-    prefs_.RegisterBooleanPref(prefs::kUseVerticalTabs, false);
+    prefs_->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false);
+    prefs_->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, false);
+    prefs_->RegisterBooleanPref(prefs::kUseVerticalTabs, false);
 #endif
     testing::ClearState();
   }
@@ -103,21 +104,21 @@ class AboutFlagsTest : public ::testing::Test {
     testing::SetExperiments(NULL, 0);
   }
 
-  TestingPrefService prefs_;
+  scoped_ptr<TestingPrefService> prefs_;
 };
 
 TEST_F(AboutFlagsTest, ChangeNeedsRestart) {
   EXPECT_FALSE(IsRestartNeededToCommitChanges());
-  SetExperimentEnabled(&prefs_, kFlags1, true);
+  SetExperimentEnabled(prefs_.get(), kFlags1, true);
   EXPECT_TRUE(IsRestartNeededToCommitChanges());
 }
 
 TEST_F(AboutFlagsTest, AddTwoFlagsRemoveOne) {
   // Add two experiments, check they're there.
-  SetExperimentEnabled(&prefs_, kFlags1, true);
-  SetExperimentEnabled(&prefs_, kFlags2, true);
+  SetExperimentEnabled(prefs_.get(), kFlags1, true);
+  SetExperimentEnabled(prefs_.get(), kFlags2, true);
 
-  ListValue* experiments_list = prefs_.GetMutableList(
+  ListValue* experiments_list = prefs_->GetMutableList(
       prefs::kEnabledLabsExperiments);
   ASSERT_TRUE(experiments_list != NULL);
 
@@ -132,9 +133,9 @@ TEST_F(AboutFlagsTest, AddTwoFlagsRemoveOne) {
   EXPECT_TRUE(s0 == kFlags2 || s1 == kFlags2);
 
   // Remove one experiment, check the other's still around.
-  SetExperimentEnabled(&prefs_, kFlags2, false);
+  SetExperimentEnabled(prefs_.get(), kFlags2, false);
 
-  experiments_list = prefs_.GetMutableList(prefs::kEnabledLabsExperiments);
+  experiments_list = prefs_->GetMutableList(prefs::kEnabledLabsExperiments);
   ASSERT_TRUE(experiments_list != NULL);
   ASSERT_EQ(1u, experiments_list->GetSize());
   ASSERT_TRUE(experiments_list->GetString(0, &s0));
@@ -143,21 +144,21 @@ TEST_F(AboutFlagsTest, AddTwoFlagsRemoveOne) {
 
 TEST_F(AboutFlagsTest, AddTwoFlagsRemoveBoth) {
   // Add two experiments, check the pref exists.
-  SetExperimentEnabled(&prefs_, kFlags1, true);
-  SetExperimentEnabled(&prefs_, kFlags2, true);
-  ListValue* experiments_list = prefs_.GetMutableList(
+  SetExperimentEnabled(prefs_.get(), kFlags1, true);
+  SetExperimentEnabled(prefs_.get(), kFlags2, true);
+  ListValue* experiments_list = prefs_->GetMutableList(
       prefs::kEnabledLabsExperiments);
   ASSERT_TRUE(experiments_list != NULL);
 
   // Remove both, the pref should have been removed completely.
-  SetExperimentEnabled(&prefs_, kFlags1, false);
-  SetExperimentEnabled(&prefs_, kFlags2, false);
-  experiments_list = prefs_.GetMutableList(prefs::kEnabledLabsExperiments);
+  SetExperimentEnabled(prefs_.get(), kFlags1, false);
+  SetExperimentEnabled(prefs_.get(), kFlags2, false);
+  experiments_list = prefs_->GetMutableList(prefs::kEnabledLabsExperiments);
   EXPECT_TRUE(experiments_list == NULL || experiments_list->GetSize() == 0);
 }
 
 TEST_F(AboutFlagsTest, ConvertFlagsToSwitches) {
-  SetExperimentEnabled(&prefs_, kFlags1, true);
+  SetExperimentEnabled(prefs_.get(), kFlags1, true);
 
   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitch("foo");
@@ -165,7 +166,7 @@ TEST_F(AboutFlagsTest, ConvertFlagsToSwitches) {
   EXPECT_TRUE(command_line.HasSwitch("foo"));
   EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
 
-  ConvertFlagsToSwitches(&prefs_, &command_line);
+  ConvertFlagsToSwitches(prefs_.get(), &command_line);
 
   EXPECT_TRUE(command_line.HasSwitch("foo"));
   EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
@@ -178,7 +179,7 @@ TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
   switch_list[switches::kFlagSwitchesEnd] = CommandLine::StringType();
   switch_list["foo"] = CommandLine::StringType();
 
-  SetExperimentEnabled(&prefs_, kFlags1, true);
+  SetExperimentEnabled(prefs_.get(), kFlags1, true);
 
   // This shouldn't do anything before ConvertFlagsToSwitches() wasn't called.
   RemoveFlagsSwitches(&switch_list);
@@ -193,7 +194,7 @@ TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
   // Call ConvertFlagsToSwitches(), then RemoveFlagsSwitches() again.
   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitch("foo");
-  ConvertFlagsToSwitches(&prefs_, &command_line);
+  ConvertFlagsToSwitches(prefs_.get(), &command_line);
   RemoveFlagsSwitches(&switch_list);
 
   // Now the about:flags-related switch should have been removed.
@@ -204,20 +205,20 @@ TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
 // Tests enabling experiments that aren't supported on the current platform.
 TEST_F(AboutFlagsTest, PersistAndPrune) {
   // Enable experiments 1 and 3.
-  SetExperimentEnabled(&prefs_, kFlags1, true);
-  SetExperimentEnabled(&prefs_, kFlags3, true);
+  SetExperimentEnabled(prefs_.get(), kFlags1, true);
+  SetExperimentEnabled(prefs_.get(), kFlags3, true);
   CommandLine command_line(CommandLine::NO_PROGRAM);
   EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
   EXPECT_FALSE(command_line.HasSwitch(kSwitch3));
 
   // Convert the flags to switches. Experiment 3 shouldn't be among the switches
   // as it is not applicable to the current platform.
-  ConvertFlagsToSwitches(&prefs_, &command_line);
+  ConvertFlagsToSwitches(prefs_.get(), &command_line);
   EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
   EXPECT_FALSE(command_line.HasSwitch(kSwitch3));
 
   // Experiment 3 should show still be persisted in preferences though.
-  scoped_ptr<ListValue> switch_prefs(GetFlagsExperimentsData(&prefs_));
+  scoped_ptr<ListValue> switch_prefs(GetFlagsExperimentsData(prefs_.get()));
   ASSERT_TRUE(switch_prefs.get());
   EXPECT_EQ(arraysize(kExperiments) - 1, switch_prefs->GetSize());
 }
@@ -225,31 +226,31 @@ TEST_F(AboutFlagsTest, PersistAndPrune) {
 // Tests enabling multi-value type experiments.
 TEST_F(AboutFlagsTest, MultiValues) {
   // Enable the multi value experiment, which should enable the first choice.
-  SetExperimentEnabled(&prefs_, kFlags4, true);
+  SetExperimentEnabled(prefs_.get(), kFlags4, true);
   {
     CommandLine command_line(CommandLine::NO_PROGRAM);
-    ConvertFlagsToSwitches(&prefs_, &command_line);
+    ConvertFlagsToSwitches(prefs_.get(), &command_line);
     EXPECT_TRUE(command_line.HasSwitch(kMultiSwitch1));
     EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
   }
 
   // Enable the 2nd choice of the multi-value, which should disable the first
   // choice.
-  SetExperimentEnabled(&prefs_, std::string(kFlags4) +
+  SetExperimentEnabled(prefs_.get(), std::string(kFlags4) +
                        std::string(testing::kMultiSeparator) +
                        base::IntToString(1), true);
   {
     CommandLine command_line(CommandLine::NO_PROGRAM);
-    ConvertFlagsToSwitches(&prefs_, &command_line);
+    ConvertFlagsToSwitches(prefs_.get(), &command_line);
     EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
     EXPECT_TRUE(command_line.HasSwitch(kMultiSwitch2));
   }
 
   // Disable the multi-value experiment.
-  SetExperimentEnabled(&prefs_, kFlags4, false);
+  SetExperimentEnabled(prefs_.get(), kFlags4, false);
   {
     CommandLine command_line(CommandLine::NO_PROGRAM);
-    ConvertFlagsToSwitches(&prefs_, &command_line);
+    ConvertFlagsToSwitches(prefs_.get(), &command_line);
     EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
     EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
   }