| Index: chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
|
| diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
|
| index 51c3ba5ac6f19db1aec9c8c361b5d7abe5c611d0..630b163238cf8b8ad0e30ee6f331a0d84e0c7faa 100644
|
| --- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
|
| +++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
|
| @@ -207,13 +207,13 @@ void SupervisedUserSyncService::RemoveObserver(
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| -scoped_ptr<base::DictionaryValue> SupervisedUserSyncService::CreateDictionary(
|
| - const std::string& name,
|
| - const std::string& master_key,
|
| - const std::string& signature_key,
|
| - const std::string& encryption_key,
|
| - int avatar_index) {
|
| - scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
|
| +std::unique_ptr<base::DictionaryValue>
|
| +SupervisedUserSyncService::CreateDictionary(const std::string& name,
|
| + const std::string& master_key,
|
| + const std::string& signature_key,
|
| + const std::string& encryption_key,
|
| + int avatar_index) {
|
| + std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
|
| result->SetString(kName, name);
|
| result->SetString(kMasterKey, master_key);
|
| result->SetString(kPasswordSignatureKey, signature_key);
|
| @@ -274,7 +274,7 @@ void SupervisedUserSyncService::UpdateSupervisedUserImpl(
|
| bool add_user) {
|
| DictionaryPrefUpdate update(prefs_, prefs::kSupervisedUsers);
|
| base::DictionaryValue* dict = update.Get();
|
| - scoped_ptr<base::DictionaryValue> value = CreateDictionary(
|
| + std::unique_ptr<base::DictionaryValue> value = CreateDictionary(
|
| name, master_key, signature_key, encryption_key, avatar_index);
|
|
|
| DCHECK_EQ(add_user, !dict->HasKey(id));
|
| @@ -407,8 +407,8 @@ void SupervisedUserSyncService::Shutdown() {
|
| SyncMergeResult SupervisedUserSyncService::MergeDataAndStartSyncing(
|
| ModelType type,
|
| const SyncDataList& initial_sync_data,
|
| - scoped_ptr<SyncChangeProcessor> sync_processor,
|
| - scoped_ptr<SyncErrorFactory> error_handler) {
|
| + std::unique_ptr<SyncChangeProcessor> sync_processor,
|
| + std::unique_ptr<SyncErrorFactory> error_handler) {
|
| DCHECK_EQ(SUPERVISED_USERS, type);
|
| sync_processor_ = std::move(sync_processor);
|
| error_handler_ = std::move(error_handler);
|
|
|