| 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..083223faff24fba5229998ba2f61a34bea39c906 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),
|
| + scoped_refptr<ExtensionPrefStore> pref_store,
|
| + scoped_refptr<ExtensionPrefStore> incognito_pref_store)
|
| + : ExtensionPrefs(prefs, incognito_prefs, root_dir_, pref_store,
|
| + incognito_pref_store),
|
| currentTime(base::Time::Now()) {}
|
| ~MockExtensionPrefs() {}
|
|
|
| @@ -70,14 +73,23 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
|
| file_loop.RunAllPending();
|
| }
|
|
|
| - ExtensionPrefStore* pref_store = new ExtensionPrefStore;
|
| + scoped_refptr<ExtensionPrefStore> pref_store = new ExtensionPrefStore;
|
| 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));
|
| +
|
| + scoped_refptr<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) {
|
|
|