Make user_manager::UserImage non-copyable

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.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/wallpaper/wallpaper_manager.h"
 
 #include <stdint.h>
 #include <numeric>
 #include <utility>
 #include <vector>
@@ skipping 809 matching lines @@
       break;
     }
   }
 
   if (loading_.empty())
     FOR_EACH_OBSERVER(Observer, observers_, OnPendingListEmptyForTesting());
 }
 
 void WallpaperManager::SetPolicyControlledWallpaper(
     const AccountId& account_id,
-    const user_manager::UserImage& user_image) {
+    scoped_ptr<user_manager::UserImage> user_image) {
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(account_id);
   if (!user) {
     NOTREACHED() << "Unknown user.";
     return;
   }
 
   const wallpaper::WallpaperFilesId wallpaper_files_id =
       GetKnownUserWallpaperFilesId(*user);
   if (!wallpaper_files_id.is_valid()) {
     cryptohome::AsyncMethodCaller::GetInstance()->AsyncGetSanitizedUsername(
         GetUnhashedSourceForWallpaperFilesId(*user),
         base::Bind(&WallpaperManager::SetCustomWallpaperOnSanitizedUsername,
-                   weak_factory_.GetWeakPtr(), account_id, user_image.image(),
+                   weak_factory_.GetWeakPtr(), account_id, user_image->image(),
                    true /* update wallpaper */));
   } else {
     SetCustomWallpaper(account_id, wallpaper_files_id, "policy-controlled.jpeg",
                        wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED,
-                       user_manager::User::POLICY, user_image.image(),
+                       user_manager::User::POLICY, user_image->image(),
                        true /* update wallpaper */);
   }
 }
 
 void WallpaperManager::SetCustomWallpaperOnSanitizedUsername(
     const AccountId& account_id,
     const gfx::ImageSkia& image,
     bool update_wallpaper,
     bool cryptohome_success,
     const std::string& wallpaper_files_id_str) {
@@ skipping 80 matching lines @@
   info->type = static_cast<user_manager::User::WallpaperType>(type);
   info->date = base::Time::FromInternalValue(date_val);
   return true;
 }
 
 void WallpaperManager::OnWallpaperDecoded(
     const AccountId& account_id,
     wallpaper::WallpaperLayout layout,
     bool update_wallpaper,
     MovableOnDestroyCallbackHolder on_finish,
-    const user_manager::UserImage& user_image) {
+    scoped_ptr<user_manager::UserImage> user_image) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   TRACE_EVENT_ASYNC_END0("ui", "LoadAndDecodeWallpaper", this);
 
   // If decoded wallpaper is empty, we have probably failed to decode the file.
   // Use default wallpaper in this case.
-  if (user_image.image().isNull()) {
+  if (user_image->image().isNull()) {
     // Updates user pref to default wallpaper.
     WallpaperInfo info = {"",
                           wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED,
                           user_manager::User::DEFAULT,
                           base::Time::Now().LocalMidnight()};
     SetUserWallpaperInfo(account_id, info, true);
 
     if (update_wallpaper)
       DoSetDefaultWallpaper(account_id, std::move(on_finish));
     return;
   }
 
   // Update the image, but keep the path which was set earlier.
-  wallpaper_cache_[account_id].second = user_image.image();
+  wallpaper_cache_[account_id].second = user_image->image();
 
   if (update_wallpaper) {
     ash::Shell::GetInstance()
         ->desktop_background_controller()
-        ->SetWallpaperImage(user_image.image(), layout);
+        ->SetWallpaperImage(user_image->image(), layout);
   }
 }
 
 void WallpaperManager::StartLoad(const AccountId& account_id,
                                  const WallpaperInfo& info,
                                  bool update_wallpaper,
                                  const base::FilePath& wallpaper_path,
                                  MovableOnDestroyCallbackHolder on_finish) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   TRACE_EVENT_ASYNC_BEGIN0("ui", "LoadAndDecodeWallpaper", this);
@@ skipping 82 matching lines @@
   child_large_wallpaper_file_ = command_line->GetSwitchValuePath(
       chromeos::switches::kChildWallpaperLarge);
   default_wallpaper_image_.reset();
 }
 
 void WallpaperManager::OnDefaultWallpaperDecoded(
     const base::FilePath& path,
     const wallpaper::WallpaperLayout layout,
     scoped_ptr<user_manager::UserImage>* result_out,
     MovableOnDestroyCallbackHolder on_finish,
-    const user_manager::UserImage& user_image) {
-  result_out->reset(new user_manager::UserImage(user_image));
+    scoped_ptr<user_manager::UserImage> user_image) {
+  *result_out = std::move(user_image);
   ash::Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage(
-      user_image.image(), layout);
+      (*result_out)->image(), layout);
 }
 
 void WallpaperManager::StartLoadAndSetDefaultWallpaper(
     const base::FilePath& path,
     const wallpaper::WallpaperLayout layout,
     MovableOnDestroyCallbackHolder on_finish,
     scoped_ptr<user_manager::UserImage>* result_out) {
   user_image_loader::StartWithFilePath(
       task_runner_, path, ImageDecoder::ROBUST_JPEG_CODEC,
       0,  // Do not crop.
@@ skipping 44 matching lines @@
     DoSetDefaultWallpaper(EmptyAccountId(), MovableOnDestroyCallbackHolder());
   }
 }
 
 wallpaper::WallpaperFilesId WallpaperManager::GetFilesId(
     const user_manager::User& user) const {
   return GetKnownUserWallpaperFilesId(user);
 }
 
 }  // namespace chromeos