Make user_manager::UserImage non-copyable

components/user_manager/user.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.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 118 matching lines @@
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ? base::UTF8ToUTF16(GetAccountName(true))
                                : display_name_;
 }
 
 base::string16 User::GetGivenName() const {
   return given_name_;
 }
 
 const gfx::ImageSkia& User::GetImage() const {
-  return user_image_.image();
+  return user_image_->image();
 }
 
 const AccountId& User::GetAccountId() const {
   return account_id_;
 }
 
 void User::SetIsChild(bool is_child) {
   VLOG(1) << "Ignoring SetIsChild call with param " << is_child;
   if (is_child) {
     NOTREACHED() << "Calling SetIsChild(true) for base User class."
@@ skipping 67 matching lines @@
 }
 
 User* User::CreateSupervisedUser(const AccountId& account_id) {
   return new SupervisedUser(account_id);
 }
 
 User* User::CreatePublicAccountUser(const AccountId& account_id) {
   return new PublicAccountUser(account_id);
 }
 
-User::User(const AccountId& account_id) : account_id_(account_id) {}
+User::User(const AccountId& account_id) : account_id_(account_id),
+                                          user_image_(new UserImage) {}
 
 User::~User() {
 }
 
 void User::SetAccountLocale(const std::string& resolved_account_locale) {
   account_locale_.reset(new std::string(resolved_account_locale));
 }
 
-void User::SetImage(const UserImage& user_image, int image_index) {
-  user_image_ = user_image;
+void User::SetImage(scoped_ptr<UserImage> user_image, int image_index) {
+  user_image_ = std::move(user_image);
   image_index_ = image_index;
   image_is_stub_ = false;
   image_is_loading_ = false;
-  DCHECK(HasDefaultImage() || user_image.has_image_bytes());
+  DCHECK(HasDefaultImage() || user_image_->has_image_bytes());
 }
 
 void User::SetImageURL(const GURL& image_url) {
-  user_image_.set_url(image_url);
+  user_image_->set_url(image_url);
 }
 
-void User::SetStubImage(const UserImage& stub_user_image,
+void User::SetStubImage(scoped_ptr<UserImage> stub_user_image,
                         int image_index,
                         bool is_loading) {
-  user_image_ = stub_user_image;
+  user_image_ = std::move(stub_user_image);
   image_index_ = image_index;
   image_is_stub_ = true;
   image_is_loading_ = is_loading;
 }
 
 RegularUser::RegularUser(const AccountId& account_id) : User(account_id) {
   set_can_lock(true);
   set_display_email(account_id.GetUserEmail());
 }
 
@@ skipping 92 matching lines @@
     case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace user_manager