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

Unified Diff: chrome/browser/prefs/pref_service_syncable_builder.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Switch to desired interfaces. Created 7 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
Index: chrome/browser/prefs/pref_service_syncable_builder.cc
diff --git a/chrome/browser/prefs/pref_service_syncable_builder.cc b/chrome/browser/prefs/pref_service_syncable_builder.cc
index 4c1327751800205c3089cea10ab37079e2f44251..cd46da2454bd14e210d3cf88b6a0da52ada652af 100644
--- a/chrome/browser/prefs/pref_service_syncable_builder.cc
+++ b/chrome/browser/prefs/pref_service_syncable_builder.cc
@@ -41,7 +41,7 @@ PrefServiceSyncableBuilder::WithCommandLine(CommandLine* command_line) {
}
PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable() {
- DefaultPrefStore* default_pref_store = new DefaultPrefStore();
+ PrefRegistry* pref_registry = new PrefRegistry();
PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
PrefServiceSyncable* pref_service = new PrefServiceSyncable(
pref_notifier,
@@ -51,10 +51,10 @@ PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable() {
command_line_prefs_.get(),
user_prefs_.get(),
recommended_prefs_.get(),
- default_pref_store,
+ pref_registry,
pref_notifier),
user_prefs_.get(),
- default_pref_store,
+ make_scoped_ptr(pref_registry).Pass(),
read_error_callback_,
async_);
ResetDefaultState();

Powered by Google App Engine
This is Rietveld 408576698