Make user_manager::UserImage non-copyable

components/user_manager/user_image/user_image.h

 // 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.
 
 #ifndef COMPONENTS_USER_MANAGER_USER_IMAGE_USER_IMAGE_H_
 #define COMPONENTS_USER_MANAGER_USER_IMAGE_USER_IMAGE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
  public:
   // Used to store bytes representation for WebUI.
   // TODO(ivankr): replace with RefCountedMemory to prevent copying.
   typedef std::vector<unsigned char> Bytes;
 
   // Encodes the given bitmap to bytes representation for WebUI. Returns null
   // on failure.
   static scoped_ptr<Bytes> Encode(const SkBitmap& bitmap);
 
   // Creates a new instance from a given still frame and tries to encode it
-  // to bytes representation for WebUI.
+  // to bytes representation for WebUI. Always returns a non-null result.
   // TODO(ivankr): remove eventually.
-  static UserImage CreateAndEncode(const gfx::ImageSkia& image);
+  static scoped_ptr<UserImage> CreateAndEncode(const gfx::ImageSkia& image);
 
   // Create instance with an empty still frame and no bytes
   // representation for WebUI.
   UserImage();
 
   // Creates a new instance from a given still frame without any bytes
   // representation for WebUI.
   explicit UserImage(const gfx::ImageSkia& image);
 
   // Creates a new instance from a given still frame and bytes
   // representation for WebUI.
   UserImage(const gfx::ImageSkia& image, const Bytes& image_bytes);

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

This ctor still copies image bytes.

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

Added a TODO comment.

 
   virtual ~UserImage();
 
   const gfx::ImageSkia& image() const { return image_; }
 
   // Optional bytes representation of the still image for WebUI.
   bool has_image_bytes() const { return has_image_bytes_; }
   const Bytes& image_bytes() const { return image_bytes_; }
 
   // URL from which this image was originally downloaded, if any.
@@ skipping 12 matching lines @@
 
  private:
   gfx::ImageSkia image_;
   bool has_image_bytes_;
   Bytes image_bytes_;
   GURL url_;
 
   // If image was loaded from the local file, file path is stored here.
   base::FilePath file_path_;
   bool is_safe_format_;
+
+  DISALLOW_COPY_AND_ASSIGN(UserImage);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_IMAGE_USER_IMAGE_H_