Support persistent incognito preferences

chrome/browser/extensions/extension_prefs_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 "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ skipping 677 matching lines @@
                                                 kDefaultPref3,
                                                 PrefService::UNSYNCABLE_PREF);
     prefs()->pref_service()->RegisterStringPref(kPref4,
                                                 kDefaultPref4,
                                                 PrefService::UNSYNCABLE_PREF);
   }
 
   void InstallExtControlledPref(Extension *ext,
                                 const std::string& key,
                                 Value* val) {
+    using namespace extension_prefs_scope;
     EnsureExtensionInstalled(ext);
-    prefs()->SetExtensionControlledPref(ext->id(), key, false, val);
+    prefs()->SetExtensionControlledPref(ext->id(), key, kRegular, val);
   }
 
   void InstallExtControlledPrefIncognito(Extension *ext,
                                          const std::string& key,
                                          Value* val) {
+    using namespace extension_prefs_scope;
     EnsureExtensionInstalled(ext);
-    prefs()->SetExtensionControlledPref(ext->id(), key, true, val);
+    prefs()->SetExtensionControlledPref(ext->id(), key,
+                                        kIncognitoPersistent, val);
   }
 
   void InstallExtension(Extension *ext) {
     EnsureExtensionInstalled(ext);
   }
 
   void UninstallExtension(const std::string& extension_id) {
     EnsureExtensionUninstalled(extension_id);
   }
 
@@ skipping 39 matching lines @@
   virtual void Initialize() {
     InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
   }
   virtual void Verify() {
     std::string actual = prefs()->pref_service()->GetString(kPref1);
     EXPECT_EQ("val1", actual);
   }
 };
 TEST_F(ExtensionPrefsInstallOneExtension, ExtensionPrefsInstallOneExtension) {}
 
-// Check that we forget incognito values after a reload.
+// Check that we do not forget persistent incognito values after a reload.
 class ExtensionPrefsInstallIncognito
     : public ExtensionPrefsPreferencesBase {
  public:
-  ExtensionPrefsInstallIncognito() : iteration_(0) {}
-
   virtual void Initialize() {
     InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
     InstallExtControlledPrefIncognito(ext1_, kPref1,
                                       Value::CreateStringValue("val2"));
     scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
     std::string actual = incog_prefs->GetString(kPref1);
     EXPECT_EQ("val2", actual);
   }
   virtual void Verify() {
     // Main pref service shall see only non-incognito settings.
     std::string actual = prefs()->pref_service()->GetString(kPref1);
     EXPECT_EQ("val1", actual);
-    // Incognito pref service shall see incognito values only during first run.
-    // Once the pref service was reloaded, all values shall be discarded.
+    // Incognito pref service shall see incognito values.
     scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
     actual = incog_prefs->GetString(kPref1);
-    if (iteration_ == 0) {
-      EXPECT_EQ("val2", actual);
-    } else {
-      EXPECT_EQ("val1", actual);
-    }
-    ++iteration_;
+    EXPECT_EQ("val2", actual);
   }
-  int iteration_;
 };
 TEST_F(ExtensionPrefsInstallIncognito, ExtensionPrefsInstallOneExtension) {}
 
 class ExtensionPrefsUninstallExtension
     : public ExtensionPrefsPreferencesBase {
   virtual void Initialize() {
     InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
     InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2"));
 
     UninstallExtension(ext1_->id());
@@ skipping 148 matching lines @@
     testing::Mock::VerifyAndClearExpectations(v1i);
     testing::Mock::VerifyAndClearExpectations(v2);
     testing::Mock::VerifyAndClearExpectations(v2i);
   }
 
   virtual void Verify() {
   }
 };
 TEST_F(ExtensionPrefsSetExtensionControlledPref,
     ExtensionPrefsSetExtensionControlledPref) {}