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

chrome/browser/supervised_user/legacy/supervised_user_sync_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/legacy/supervised_user_sync_service.h"
 
 #include <stddef.h>
 #include <set>
 #include <utility>
 
@@ skipping 189 matching lines @@
 void SupervisedUserSyncService::AddObserver(
     SupervisedUserSyncServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void SupervisedUserSyncService::RemoveObserver(
     SupervisedUserSyncServiceObserver* observer) {
   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);
   result->SetString(kPasswordEncryptionKey, encryption_key);
   // TODO(akuegel): Get rid of the avatar stuff here when Chrome OS switches
   // to the avatar index that is stored as a shared setting.
   std::string chrome_avatar;
   std::string chromeos_avatar;
 #if defined(OS_CHROMEOS)
   chromeos_avatar = BuildAvatarString(avatar_index);
@@ skipping 40 matching lines @@
 void SupervisedUserSyncService::UpdateSupervisedUserImpl(
     const std::string& id,
     const std::string& name,
     const std::string& master_key,
     const std::string& signature_key,
     const std::string& encryption_key,
     int avatar_index,
     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));
   base::DictionaryValue* entry = value.get();
   dict->SetWithoutPathExpansion(id, value.release());
 
   if (!sync_processor_)
     return;
 
   // If we're already syncing, create a new change and upload it.
@@ skipping 112 matching lines @@
 }
 
 void SupervisedUserSyncService::Shutdown() {
   NotifySupervisedUsersSyncingStopped();
   SigninManagerFactory::GetForProfile(profile_)->RemoveObserver(this);
 }
 
 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);
 
   SyncChangeList change_list;
   SyncMergeResult result(SUPERVISED_USERS);
 
   DictionaryPrefUpdate update(prefs_, prefs::kSupervisedUsers);
   base::DictionaryValue* dict = update.Get();
   result.set_num_items_before_association(dict->size());
@@ skipping 149 matching lines @@
                     OnSupervisedUsersChanged());
 }
 
 void SupervisedUserSyncService::DispatchCallbacks() {
   const base::DictionaryValue* supervised_users =
       prefs_->GetDictionary(prefs::kSupervisedUsers);
   for (const auto& callback : callbacks_)
     callback.Run(supervised_users);
   callbacks_.clear();
 }