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

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

Issue 2860683002: WIP: Pref service: use the incognito support from Chrome
Patch Set: Rebase Created 3 years, 8 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/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 3211483fb737713001c73028c39f9f8b80c37388..167b727d3a0e3e667d16ec0e44b1bda105804ec5 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -448,7 +448,8 @@ std::unique_ptr<PrefService> CreateLocalState(
return factory.Create(pref_registry.get());
}
-std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
+std::unique_ptr<sync_preferences::PrefServiceSyncableFactory>
+CreateProfilePrefs(
const base::FilePath& profile_path,
prefs::mojom::TrackedPreferenceValidationDelegatePtr validation_delegate,
policy::PolicyService* policy_service,
@@ -464,7 +465,8 @@ std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
mojo::MakeStrongBinding(
base::MakeUnique<ResetOnLoadObserverImpl>(profile_path),
mojo::MakeRequest(&reset_on_load_observer));
- sync_preferences::PrefServiceSyncableFactory factory;
+ auto factory =
+ base::MakeUnique<sync_preferences::PrefServiceSyncableFactory>();
scoped_refptr<PersistentPrefStore> user_pref_store(
CreateProfilePrefStoreManager(profile_path)
->CreateProfilePrefStore(
@@ -472,13 +474,10 @@ std::unique_ptr<sync_preferences::PrefServiceSyncable> CreateProfilePrefs(
content::BrowserThread::GetBlockingPool(),
std::move(reset_on_load_observer), std::move(validation_delegate),
connector, pref_registry));
- PrepareFactory(&factory, profile_path, policy_service,
+ PrepareFactory(factory.get(), profile_path, policy_service,
supervised_user_settings, user_pref_store, extension_prefs,
async);
- std::unique_ptr<sync_preferences::PrefServiceSyncable> pref_service =
- factory.CreateSyncable(pref_registry.get(), connector);
-
- return pref_service;
+ return factory;
}
void DisableDomainCheckForTesting() {
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_factory.h ('k') | chrome/browser/prefs/pref_service_syncable_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698