Stop passing raw pointers to DictionaryValue::Set, part 2

chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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/chromeos/login/supervised/supervised_user_creation_screen.h"
 
 #include <utility>
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ash/shell.h"
@@ skipping 511 matching lines @@
     const base::DictionaryValue* users) {
   // Copy for passing to WebUI, contains only id, name and avatar URL.
   std::unique_ptr<base::ListValue> ui_users(new base::ListValue());
   SupervisedUserManager* supervised_user_manager =
       ChromeUserManager::Get()->GetSupervisedUserManager();
 
   // Stored copy, contains all necessary information.
   existing_users_.reset(new base::DictionaryValue());
   for (base::DictionaryValue::Iterator it(*users); !it.IsAtEnd();
        it.Advance()) {
+    const base::DictionaryValue* value = nullptr;
+    it.value().GetAsDictionary(&value);
     // Copy that would be stored in this class.
-    base::DictionaryValue* local_copy =
-        static_cast<base::DictionaryValue*>(it.value().DeepCopy());
+    std::unique_ptr<base::DictionaryValue> local_copy = value->CreateDeepCopy();
     // Copy that would be passed to WebUI. It has some extra values for
     // displaying, but does not contain sensitive data, such as master password.
     auto ui_copy = base::MakeUnique<base::DictionaryValue>();
 
     int avatar_index = SupervisedUserCreationController::kDummyAvatarIndex;
     std::string chromeos_avatar;
     if (local_copy->GetString(SupervisedUserSyncService::kChromeOsAvatar,
                               &chromeos_avatar) &&
         !chromeos_avatar.empty() &&
         SupervisedUserSyncService::GetAvatarIndex(
@@ skipping 32 matching lines @@
 
     std::string signature_key;
     bool has_password =
         local_copy->GetString(SupervisedUserSyncService::kPasswordSignatureKey,
                               &signature_key) &&
         !signature_key.empty();
 
     ui_copy->SetBoolean(kUserNeedPassword, !has_password);
     ui_copy->SetString("id", it.key());
 
-    existing_users_->Set(it.key(), local_copy);
+    existing_users_->Set(it.key(), std::move(local_copy));
     ui_users->Append(std::move(ui_copy));
   }
   view_->ShowExistingSupervisedUsers(ui_users.get());
 }
 
 void SupervisedUserCreationScreen::OnPhotoTaken(
     const std::string& raw_data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   user_photo_ = gfx::ImageSkia();
   ImageDecoder::Cancel(this);
@@ skipping 24 matching lines @@
     selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
   } else {
     NOTREACHED() << "Unexpected image type: " << image_type;
   }
 }
 
 void SupervisedUserCreationScreen::OnImageAccepted() {
 }
 
 }  // namespace chromeos