| Index: chrome/service/service_process_prefs.cc
|
| diff --git a/chrome/service/service_process_prefs.cc b/chrome/service/service_process_prefs.cc
|
| index 7cbfda7bcd3754d20830a2c6fd9cce2a47dca0b1..33846a61e31af3a49fbb64ad07e750428a24222f 100644
|
| --- a/chrome/service/service_process_prefs.cc
|
| +++ b/chrome/service/service_process_prefs.cc
|
| @@ -6,17 +6,16 @@
|
|
|
| #include <utility>
|
|
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/values.h"
|
| #include "components/prefs/pref_filter.h"
|
|
|
| -ServiceProcessPrefs::ServiceProcessPrefs(
|
| - const base::FilePath& pref_filename,
|
| - base::SequencedTaskRunner* task_runner)
|
| +ServiceProcessPrefs::ServiceProcessPrefs(const base::FilePath& pref_filename,
|
| + base::SequencedTaskRunner* task_runner)
|
| : prefs_(new JsonPrefStore(pref_filename,
|
| task_runner,
|
| - scoped_ptr<PrefFilter>())) {
|
| -}
|
| + std::unique_ptr<PrefFilter>())) {}
|
|
|
| ServiceProcessPrefs::~ServiceProcessPrefs() {}
|
|
|
| @@ -41,7 +40,7 @@ std::string ServiceProcessPrefs::GetString(
|
|
|
| void ServiceProcessPrefs::SetString(const std::string& key,
|
| const std::string& value) {
|
| - prefs_->SetValue(key, make_scoped_ptr(new base::StringValue(value)),
|
| + prefs_->SetValue(key, base::WrapUnique(new base::StringValue(value)),
|
| WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
| }
|
|
|
| @@ -56,7 +55,7 @@ bool ServiceProcessPrefs::GetBoolean(const std::string& key,
|
| }
|
|
|
| void ServiceProcessPrefs::SetBoolean(const std::string& key, bool value) {
|
| - prefs_->SetValue(key, make_scoped_ptr(new base::FundamentalValue(value)),
|
| + prefs_->SetValue(key, base::WrapUnique(new base::FundamentalValue(value)),
|
| WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
| }
|
|
|
| @@ -71,7 +70,7 @@ int ServiceProcessPrefs::GetInt(const std::string& key,
|
| }
|
|
|
| void ServiceProcessPrefs::SetInt(const std::string& key, int value) {
|
| - prefs_->SetValue(key, make_scoped_ptr(new base::FundamentalValue(value)),
|
| + prefs_->SetValue(key, base::WrapUnique(new base::FundamentalValue(value)),
|
| WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
| }
|
|
|
| @@ -96,7 +95,7 @@ const base::ListValue* ServiceProcessPrefs::GetList(
|
| }
|
|
|
| void ServiceProcessPrefs::SetValue(const std::string& key,
|
| - scoped_ptr<base::Value> value) {
|
| + std::unique_ptr<base::Value> value) {
|
| prefs_->SetValue(key, std::move(value),
|
| WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
| }
|
|
|