Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: chrome/browser/extensions/test_extension_prefs.cc

Issue 5915004: Introduce incognito preference settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index 5b0ee7b94884196d0189421ef4e7310c7168be26..5e9201a81f8399beba16ea003a75f4bacfb7f783 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -28,9 +28,12 @@ namespace {
class MockExtensionPrefs : public ExtensionPrefs {
public:
MockExtensionPrefs(PrefService* prefs,
+ PrefService* incognito_prefs,
const FilePath& root_dir_,
- ExtensionPrefStore* pref_store)
- : ExtensionPrefs(prefs, root_dir_, pref_store),
+ ExtensionPrefStore* pref_store,
+ ExtensionPrefStore* incognito_pref_store)
+ : ExtensionPrefs(prefs, incognito_prefs, root_dir_, pref_store,
+ incognito_pref_store),
currentTime(base::Time::Now()) {}
~MockExtensionPrefs() {}
@@ -76,8 +79,16 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
builder.WithExtensionPrefs(pref_store);
pref_service_.reset(builder.Create());
ExtensionPrefs::RegisterUserPrefs(pref_service_.get());
- prefs_.reset(new MockExtensionPrefs(pref_service_.get(), temp_dir_.path(),
- pref_store));
+
+ ExtensionPrefStore* incognito_pref_store = new ExtensionPrefStore;
+ incognito_pref_service_.reset(
+ pref_service_->CreateIncognitoPrefService(incognito_pref_store));
+
+ prefs_.reset(new MockExtensionPrefs(pref_service_.get(),
+ incognito_pref_service_.get(),
+ temp_dir_.path(),
+ pref_store,
+ incognito_pref_store));
}
scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) {

Powered by Google App Engine
This is Rietveld 408576698