| Index: chrome/browser/supervised_user/supervised_user_whitelist_service.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
|
| index 91df9bf185b7d832d873f4b4486e66fb16922dd8..1ca14c19b6ea18cd2a1b9b30d0bcfbb10dc88b62 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
|
| @@ -144,8 +144,8 @@ syncer::SyncMergeResult
|
| SupervisedUserWhitelistService::MergeDataAndStartSyncing(
|
| syncer::ModelType type,
|
| const syncer::SyncDataList& initial_sync_data,
|
| - scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| - scoped_ptr<syncer::SyncErrorFactory> error_handler) {
|
| + std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
|
| + std::unique_ptr<syncer::SyncErrorFactory> error_handler) {
|
| DCHECK_EQ(syncer::SUPERVISED_USER_WHITELISTS, type);
|
|
|
| syncer::SyncChangeList change_list;
|
| @@ -280,7 +280,7 @@ void SupervisedUserWhitelistService::AddNewWhitelist(
|
| base::RecordAction(base::UserMetricsAction("ManagedUsers_Whitelist_Added"));
|
|
|
| RegisterWhitelist(whitelist.id(), whitelist.name(), FROM_SYNC);
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
|
| + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
|
| SetWhitelistProperties(dict.get(), whitelist);
|
| pref_dict->SetWithoutPathExpansion(whitelist.id(), dict.release());
|
| }
|
|
|