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

Unified Diff: components/sync_preferences/testing_pref_service_syncable.cc

Issue 2615403002: Added extension controlled prefs to TestingPrefService (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « components/sync_preferences/testing_pref_service_syncable.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_preferences/testing_pref_service_syncable.cc
diff --git a/components/sync_preferences/testing_pref_service_syncable.cc b/components/sync_preferences/testing_pref_service_syncable.cc
index 2fc6d3e1676c3c5414183630be30fa2dfae460c1..e1598e9c408ca6e97a309be1150af16653acad25 100644
--- a/components/sync_preferences/testing_pref_service_syncable.cc
+++ b/components/sync_preferences/testing_pref_service_syncable.cc
@@ -14,6 +14,7 @@ template <>
TestingPrefServiceBase<sync_preferences::PrefServiceSyncable,
user_prefs::PrefRegistrySyncable>::
TestingPrefServiceBase(TestingPrefStore* managed_prefs,
+ TestingPrefStore* extension_prefs,
TestingPrefStore* user_prefs,
TestingPrefStore* recommended_prefs,
user_prefs::PrefRegistrySyncable* pref_registry,
@@ -21,9 +22,9 @@ TestingPrefServiceBase<sync_preferences::PrefServiceSyncable,
: sync_preferences::PrefServiceSyncable(
pref_notifier,
new PrefValueStore(managed_prefs,
- nullptr, // supervised_user_prefs
- nullptr, // extension_prefs
- nullptr, // command_line_prefs
+ nullptr, // supervised_user_prefs
+ extension_prefs, // extension_prefs
+ nullptr, // command_line_prefs
user_prefs,
recommended_prefs,
pref_registry->defaults().get(),
@@ -36,6 +37,7 @@ TestingPrefServiceBase<sync_preferences::PrefServiceSyncable,
user_prefs::PrefRegistrySyncable>::HandleReadError),
false),
managed_prefs_(managed_prefs),
+ extension_prefs_(extension_prefs),
user_prefs_(user_prefs),
recommended_prefs_(recommended_prefs) {}
@@ -47,11 +49,13 @@ TestingPrefServiceSyncable::TestingPrefServiceSyncable()
new TestingPrefStore(),
new TestingPrefStore(),
new TestingPrefStore(),
+ new TestingPrefStore(),
new user_prefs::PrefRegistrySyncable(),
new PrefNotifierImpl()) {}
TestingPrefServiceSyncable::TestingPrefServiceSyncable(
TestingPrefStore* managed_prefs,
+ TestingPrefStore* extension_prefs,
TestingPrefStore* user_prefs,
TestingPrefStore* recommended_prefs,
user_prefs::PrefRegistrySyncable* pref_registry,
@@ -59,6 +63,7 @@ TestingPrefServiceSyncable::TestingPrefServiceSyncable(
: TestingPrefServiceBase<PrefServiceSyncable,
user_prefs::PrefRegistrySyncable>(
managed_prefs,
+ extension_prefs,
user_prefs,
recommended_prefs,
pref_registry,
« no previous file with comments | « components/sync_preferences/testing_pref_service_syncable.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698