Make user_manager::UserImage non-copyable

components/user_manager/user_image/user_image.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 "components/user_manager/user_image/user_image.h"
 
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
@@ skipping 19 matching lines @@
           bitmap.height(),
           bitmap.width() * bitmap.bytesPerPixel(),
           kDefaultEncodingQuality, output.get())) {
     return output;
   } else {
     return nullptr;
   }
 }
 
 // static
-UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
+scoped_ptr<UserImage> UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
   if (image.isNull())
-    return UserImage();
+    return make_scoped_ptr(new UserImage);
 
   scoped_ptr<Bytes> image_bytes = Encode(*image.bitmap());
   if (image_bytes) {
-    UserImage result(image, *image_bytes);
-    result.MarkAsSafe();
+    scoped_ptr<UserImage> result(new UserImage(image, *image_bytes));

[hashimoto, 2016/03/15 08:39:27]

This line still copies image bytes.

[satorux1, 2016/03/16 02:01:30]

Added a TODO comment.

+    result->MarkAsSafe();
     return result;
   }
-  return UserImage(image);
+  return make_scoped_ptr(new UserImage(image));
 }
 
 UserImage::UserImage()
     : has_image_bytes_(false),
       is_safe_format_(false) {
 }
 
 UserImage::UserImage(const gfx::ImageSkia& image)
     : image_(image),
       has_image_bytes_(false),
       is_safe_format_(false) {
 }
 
 UserImage::UserImage(const gfx::ImageSkia& image,
                      const Bytes& image_bytes)
     : image_(image),
       has_image_bytes_(false),
       is_safe_format_(false) {
   has_image_bytes_ = true;
   image_bytes_ = image_bytes;
 }
 
 UserImage::~UserImage() {}
 
 void UserImage::MarkAsSafe() {
   is_safe_format_ = true;
 }
 
 }  // namespace user_manager