Re-write many calls to WrapUnique() with MakeUnique()

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.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/users/avatar/user_image_manager_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 391 matching lines @@
 void UserImageManagerImpl::Job::UpdateUser(
     std::unique_ptr<user_manager::UserImage> user_image) {
   user_manager::User* user = parent_->GetUserAndModify();
   if (!user)
     return;
 
   if (!user_image->image().isNull()) {
     user->SetImage(std::move(user_image), image_index_);
   } else {
     user->SetStubImage(
-        base::WrapUnique(new user_manager::UserImage(
+        base::MakeUnique<user_manager::UserImage>(
             *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                IDR_PROFILE_PICTURE_LOADING))),
+                IDR_PROFILE_PICTURE_LOADING)),
         image_index_, false);
   }
   user->SetImageURL(image_url_);
 
   parent_->OnJobChangedUserImage();
 }
 
 void UserImageManagerImpl::Job::UpdateUserAndSaveImage(
     std::unique_ptr<user_manager::UserImage> user_image) {
   // TODO(crbug.com/593251): Remove the data copy.
@@ skipping 110 matching lines @@
 
   if (!image_properties) {
     SetInitialUserImage();
     return;
   }
 
   int image_index = user_manager::User::USER_IMAGE_INVALID;
   image_properties->GetInteger(kImageIndexNodeName, &image_index);
   if (image_index >= 0 &&
       image_index < default_user_image::kDefaultImagesCount) {
-    user->SetImage(base::WrapUnique(new user_manager::UserImage(
-                       default_user_image::GetDefaultImage(image_index))),
+    user->SetImage(base::MakeUnique<user_manager::UserImage>(
+                       default_user_image::GetDefaultImage(image_index)),
                    image_index);
     return;
   }
 
   if (image_index != user_manager::User::USER_IMAGE_EXTERNAL &&
       image_index != user_manager::User::USER_IMAGE_PROFILE) {
     NOTREACHED();
     return;
   }
 
   std::string image_url_string;
   image_properties->GetString(kImageURLNodeName, &image_url_string);
   GURL image_url(image_url_string);
   std::string image_path;
   image_properties->GetString(kImagePathNodeName, &image_path);
 
   user->SetImageURL(image_url);
-  user->SetStubImage(base::WrapUnique(new user_manager::UserImage(
+  user->SetStubImage(base::MakeUnique<user_manager::UserImage>(
                          *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                             IDR_PROFILE_PICTURE_LOADING))),
+                             IDR_PROFILE_PICTURE_LOADING)),
                      image_index, true);
   DCHECK(!image_path.empty() ||
          image_index == user_manager::User::USER_IMAGE_PROFILE);
   if (image_path.empty()) {
     // Return if the profile image is to be used but has not been downloaded
     // yet. The profile image will be downloaded after login.
     return;
   }
 
   job_.reset(new Job(this));
@@ skipping 386 matching lines @@
 }
 
 bool UserImageManagerImpl::IsUserLoggedInAndHasGaiaAccount() const {
   const user_manager::User* user = GetUser();
   if (!user)
     return false;
   return user->is_logged_in() && user->HasGaiaAccount();
 }
 
 }  // namespace chromeos