Make user_manager::UserImage non-copyable

chrome/browser/chromeos/login/users/avatar/user_image_loader.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_loader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 142 matching lines @@
     const SkBitmap& image,
     const user_manager::UserImage::Bytes& image_bytes,
     bool image_bytes_regenerated) {
   SkBitmap final_image = image;
   // Make the SkBitmap immutable as we won't modify it. This is important
   // because otherwise it gets duplicated during painting, wasting memory.
   final_image.setImmutable();
   gfx::ImageSkia final_image_skia =
       gfx::ImageSkia::CreateFrom1xBitmap(final_image);
   final_image_skia.MakeThreadSafe();
-  user_manager::UserImage user_image(final_image_skia, image_bytes);
-  user_image.set_file_path(image_info_.file_path);
+  scoped_ptr<user_manager::UserImage> user_image(
+      new user_manager::UserImage(final_image_skia, image_bytes));
+  user_image->set_file_path(image_info_.file_path);
   if (image_info_.image_codec == ImageDecoder::ROBUST_JPEG_CODEC ||
       image_bytes_regenerated)
-    user_image.MarkAsSafe();
-  image_info_.loaded_cb.Run(user_image);
+    user_image->MarkAsSafe();
+  image_info_.loaded_cb.Run(std::move(user_image));
   delete this;
 }
 
 void UserImageRequest::OnDecodeImageFailed() {
-  image_info_.loaded_cb.Run(user_manager::UserImage());
+  image_info_.loaded_cb.Run(make_scoped_ptr(new user_manager::UserImage));
   delete this;
 }
 
 // Starts decoding the image with ImageDecoder for the image |data| if
 // |data_is_ready| is true.
 void DecodeImage(
     const ImageInfo& image_info,
     scoped_refptr<base::SequencedTaskRunner> background_task_runner,
     const std::string* data,
     bool data_is_ready) {
   if (!data_is_ready) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(image_info.loaded_cb, user_manager::UserImage()));
+        FROM_HERE,
+        base::Bind(image_info.loaded_cb,
+                   base::Passed(make_scoped_ptr(new user_manager::UserImage))));
     return;
   }
 
   UserImageRequest* image_request =
       new UserImageRequest(image_info, *data, background_task_runner);
   ImageDecoder::StartWithOptions(image_request, *data, image_info.image_codec,
                                  false);
 }
 
 }  // namespace
@@ skipping 19 matching lines @@
     ImageDecoder::ImageCodec image_codec,
     int pixels_per_side,
     const LoadedCallback& loaded_cb) {
   DecodeImage(
       ImageInfo(base::FilePath(), pixels_per_side, image_codec, loaded_cb),
       background_task_runner, data.get(), true /* data_is_ready */);
 }
 
 }  // namespace user_image_loader
 }  // namespace chromeos