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

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: Continued work from last year Created 9 years, 12 months 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..aff58dbb2f56de013d01a2a9f38a3fceeb04725a 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -29,8 +29,9 @@ class MockExtensionPrefs : public ExtensionPrefs {
public:
MockExtensionPrefs(PrefService* prefs,
const FilePath& root_dir_,
- ExtensionPrefStore* pref_store)
- : ExtensionPrefs(prefs, root_dir_, pref_store),
+ ExtensionPrefStore* pref_store,
+ ExtensionPrefStore* incognito_pref_store)
+ : ExtensionPrefs(prefs, root_dir_, pref_store, incognito_pref_store),
currentTime(base::Time::Now()) {}
~MockExtensionPrefs() {}
@@ -70,14 +71,19 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
file_loop.RunAllPending();
}
- ExtensionPrefStore* pref_store = new ExtensionPrefStore;
+ ExtensionPrefStore* pref_store = new ExtensionPrefStore(false);
PrefServiceMockBuilder builder;
builder.WithUserFilePrefs(preferences_file_);
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(true);
+
+ prefs_.reset(new MockExtensionPrefs(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