Replace deprecated version of SetWithoutPathExpansion()

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>
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ skipping 396 matching lines @@
   DictionaryPrefUpdate update(prefs_, prefs::kSupervisedUsers);
   base::DictionaryValue* dict = update.Get();
   result.set_num_items_before_association(dict->size());
   std::set<std::string> seen_ids;
   int num_items_added = 0;
   int num_items_modified = 0;
   for (const SyncData& sync_data : initial_sync_data) {
     DCHECK_EQ(SUPERVISED_USERS, sync_data.GetDataType());
     const ManagedUserSpecifics& supervised_user =
         sync_data.GetSpecifics().managed_user();
-    base::DictionaryValue* value = new base::DictionaryValue();
+    std::unique_ptr<base::DictionaryValue> value =
+        base::MakeUnique<base::DictionaryValue>();
     value->SetString(kName, supervised_user.name());
     value->SetBoolean(kAcknowledged, supervised_user.acknowledged());
     value->SetString(kMasterKey, supervised_user.master_key());
     value->SetString(kChromeAvatar, supervised_user.chrome_avatar());
     value->SetString(kChromeOsAvatar, supervised_user.chromeos_avatar());
     value->SetString(kPasswordSignatureKey,
                      supervised_user.password_signature_key());
     value->SetString(kPasswordEncryptionKey,
                      supervised_user.password_encryption_key());
     if (dict->HasKey(supervised_user.id()))
       num_items_modified++;
     else
       num_items_added++;
-    dict->SetWithoutPathExpansion(supervised_user.id(), value);
+    dict->SetWithoutPathExpansion(supervised_user.id(), std::move(value));
     seen_ids.insert(supervised_user.id());
   }
 
   for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     if (seen_ids.find(it.key()) != seen_ids.end())
       continue;
 
     change_list.push_back(
         SyncChange(FROM_HERE,
                    SyncChange::ACTION_ADD,
@@ skipping 54 matching lines @@
         // an add action, it should not.
         DCHECK_EQ(
             old_value ? SyncChange::ACTION_UPDATE : SyncChange::ACTION_ADD,
             sync_change.change_type());
 
         // If the supervised user switched from unacknowledged to acknowledged,
         // we might need to continue with a registration.
         if (old_value && !old_value->HasKey(kAcknowledged))
           NotifySupervisedUserAcknowledged(supervised_user.id());
 
-        base::DictionaryValue* value = new base::DictionaryValue;
+        std::unique_ptr<base::DictionaryValue> value =
+            base::MakeUnique<base::DictionaryValue>();
         value->SetString(kName, supervised_user.name());
         value->SetBoolean(kAcknowledged, supervised_user.acknowledged());
         value->SetString(kMasterKey, supervised_user.master_key());
         value->SetString(kChromeAvatar, supervised_user.chrome_avatar());
         value->SetString(kChromeOsAvatar, supervised_user.chromeos_avatar());
         value->SetString(kPasswordSignatureKey,
                          supervised_user.password_signature_key());
         value->SetString(kPasswordEncryptionKey,
                          supervised_user.password_encryption_key());
-        dict->SetWithoutPathExpansion(supervised_user.id(), value);
+        dict->SetWithoutPathExpansion(supervised_user.id(), std::move(value));
 
         NotifySupervisedUsersChanged();
         break;
       }
       case SyncChange::ACTION_DELETE: {
         DCHECK(dict->HasKey(supervised_user.id())) << supervised_user.id();
         dict->RemoveWithoutPathExpansion(supervised_user.id(), NULL);
         break;
       }
       case SyncChange::ACTION_INVALID: {
@@ skipping 32 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();
 }