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

Unified Diff: chrome/browser/supervised_user/supervised_user_whitelist_service.cc

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/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());
}

Powered by Google App Engine
This is Rietveld 408576698