| Index: components/prefs/pref_service_factory.cc
|
| diff --git a/components/prefs/pref_service_factory.cc b/components/prefs/pref_service_factory.cc
|
| index 663695da98895e0b18f7bd4297fc261e71bff5eb..7b21ae0f164c71c341b5fb9cda99632bce47f33c 100644
|
| --- a/components/prefs/pref_service_factory.cc
|
| +++ b/components/prefs/pref_service_factory.cc
|
| @@ -36,26 +36,19 @@ PrefServiceFactory::~PrefServiceFactory() {}
|
| void PrefServiceFactory::SetUserPrefsFile(
|
| const base::FilePath& prefs_file,
|
| base::SequencedTaskRunner* task_runner) {
|
| - user_prefs_ = new JsonPrefStore(
|
| - prefs_file, task_runner, scoped_ptr<PrefFilter>());
|
| + user_prefs_ =
|
| + new JsonPrefStore(prefs_file, task_runner, std::unique_ptr<PrefFilter>());
|
| }
|
|
|
| -scoped_ptr<PrefService> PrefServiceFactory::Create(
|
| +std::unique_ptr<PrefService> PrefServiceFactory::Create(
|
| PrefRegistry* pref_registry) {
|
| PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
|
| - scoped_ptr<PrefService> pref_service(
|
| - new PrefService(pref_notifier,
|
| - new PrefValueStore(managed_prefs_.get(),
|
| - supervised_user_prefs_.get(),
|
| - extension_prefs_.get(),
|
| - command_line_prefs_.get(),
|
| - user_prefs_.get(),
|
| - recommended_prefs_.get(),
|
| - pref_registry->defaults().get(),
|
| - pref_notifier),
|
| - user_prefs_.get(),
|
| - pref_registry,
|
| - read_error_callback_,
|
| - async_));
|
| + std::unique_ptr<PrefService> pref_service(new PrefService(
|
| + pref_notifier,
|
| + new PrefValueStore(managed_prefs_.get(), supervised_user_prefs_.get(),
|
| + extension_prefs_.get(), command_line_prefs_.get(),
|
| + user_prefs_.get(), recommended_prefs_.get(),
|
| + pref_registry->defaults().get(), pref_notifier),
|
| + user_prefs_.get(), pref_registry, read_error_callback_, async_));
|
| return pref_service;
|
| }
|
|
|