Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr

chrome/browser/supervised_user/supervised_user_whitelist_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 126 matching lines @@
   whitelist->set_id(id);
   whitelist->set_name(name);
 
   return syncer::SyncData::CreateLocalData(id, name, specifics);
 }
 
 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;
   syncer::SyncMergeResult result(syncer::SUPERVISED_USER_WHITELISTS);
 
   DictionaryPrefUpdate update(prefs_, prefs::kSupervisedUserWhitelists);
   base::DictionaryValue* pref_dict = update.Get();
   result.set_num_items_before_association(pref_dict->size());
   std::set<std::string> seen_ids;
   int num_items_added = 0;
@@ skipping 114 matching lines @@
 
   return error;
 }
 
 void SupervisedUserWhitelistService::AddNewWhitelist(
     base::DictionaryValue* pref_dict,
     const sync_pb::ManagedUserWhitelistSpecifics& whitelist) {
   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());
 }
 
 void SupervisedUserWhitelistService::SetWhitelistProperties(
     base::DictionaryValue* dict,
     const sync_pb::ManagedUserWhitelistSpecifics& whitelist) {
   dict->SetString(kName, whitelist.name());
 }
 
@@ skipping 63 matching lines @@
   UMA_HISTOGRAM_TIMES("ManagedUsers.Whitelist.TotalLoadDuration",
                       base::TimeTicks::Now() - start_time);
 
   // If the whitelist has been unregistered in the mean time, ignore it.
   if (registered_whitelists_.count(id) == 0u)
     return;
 
   loaded_whitelists_[id] = whitelist;
   NotifyWhitelistsChanged();
 }