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

Unified Diff: components/pref_registry/testing_pref_service_syncable.cc

Issue 2479113002: Make extensions DSE persistent in browser prefs (Closed)
Patch Set: Tests updated(rewritten) after review Created 4 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: components/pref_registry/testing_pref_service_syncable.cc
diff --git a/components/pref_registry/testing_pref_service_syncable.cc b/components/pref_registry/testing_pref_service_syncable.cc
index 7595b2c8b8aa6fb9ff199fba04b64032ff92aaae..1c74f82c277da6a37296da1adca1a3a9c9fb0752 100644
--- a/components/pref_registry/testing_pref_service_syncable.cc
+++ b/components/pref_registry/testing_pref_service_syncable.cc
@@ -12,26 +12,29 @@
template <>
TestingPrefServiceBase<PrefService, user_prefs::PrefRegistrySyncable>::
TestingPrefServiceBase(TestingPrefStore* managed_prefs,
+ TestingPrefStore* extension_prefs,
TestingPrefStore* user_prefs,
TestingPrefStore* recommended_prefs,
user_prefs::PrefRegistrySyncable* pref_registry,
PrefNotifierImpl* pref_notifier)
- : PrefService(pref_notifier,
- new PrefValueStore(managed_prefs,
- NULL, // supervised_user_prefs
- NULL, // extension_prefs
- NULL, // command_line_prefs
- user_prefs,
- recommended_prefs,
- pref_registry->defaults().get(),
- pref_notifier),
+ : PrefService(
+ pref_notifier,
+ new PrefValueStore(managed_prefs,
+ NULL, // supervised_user_prefs
+ extension_prefs, // extension_prefs
+ NULL, // command_line_prefs
+ user_prefs,
+ recommended_prefs,
+ pref_registry->defaults().get(),
+ pref_notifier),
user_prefs,
pref_registry,
base::Bind(&TestingPrefServiceBase<
- PrefService,
- user_prefs::PrefRegistrySyncable>::HandleReadError),
+ PrefService,
+ user_prefs::PrefRegistrySyncable>::HandleReadError),
false),
managed_prefs_(managed_prefs),
+ extension_prefs_(extension_prefs),
user_prefs_(user_prefs),
recommended_prefs_(recommended_prefs) {}
@@ -42,23 +45,24 @@ TestingPrefServiceSyncable::TestingPrefServiceSyncable()
new TestingPrefStore(),
new TestingPrefStore(),
new TestingPrefStore(),
+ new TestingPrefStore(),
new PrefRegistrySyncable(),
- new PrefNotifierImpl()) {
-}
+ new PrefNotifierImpl()) {}
TestingPrefServiceSyncable::TestingPrefServiceSyncable(
TestingPrefStore* managed_prefs,
+ TestingPrefStore* extension_prefs,
TestingPrefStore* user_prefs,
TestingPrefStore* recommended_prefs,
PrefRegistrySyncable* pref_registry,
PrefNotifierImpl* pref_notifier)
: TestingPrefServiceBase<PrefService, PrefRegistrySyncable>(
managed_prefs,
+ extension_prefs,
user_prefs,
recommended_prefs,
pref_registry,
- pref_notifier) {
-}
+ pref_notifier) {}
TestingPrefServiceSyncable::~TestingPrefServiceSyncable() {
}

Powered by Google App Engine
This is Rietveld 408576698