Make user_manager::UserImage non-copyable

components/user_manager/user.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_H_
 #define COMPONENTS_USER_MANAGER_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 109 matching lines @@
   bool using_saml() const { return using_saml_; }
 
   // Returns the account name part of the email. Use the display form of the
   // email if available and use_display_name == true. Otherwise use canonical.
   std::string GetAccountName(bool use_display_email) const;
 
   // Whether the user has a default image.
   bool HasDefaultImage() const;
 
   int image_index() const { return image_index_; }
-  bool has_image_bytes() const { return user_image_.has_image_bytes(); }
+  bool has_image_bytes() const { return user_image_->has_image_bytes(); }
   // Returns bytes representation of static user image for WebUI.
   const UserImage::Bytes& image_bytes() const {
-    return user_image_.image_bytes();
+    return user_image_->image_bytes();
   }
 
   // Whether |user_image_| contains data in format that is considered safe to
   // decode in sensitive environment (on Login screen).
-  bool image_is_safe_format() const { return user_image_.is_safe_format(); }
+  bool image_is_safe_format() const { return user_image_->is_safe_format(); }
 
   // Returns the URL of user image, if there is any. Currently only the profile
   // image has a URL, for other images empty URL is returned.
-  GURL image_url() const { return user_image_.url(); }
+  GURL image_url() const { return user_image_->url(); }
 
   // True if user image is a stub (while real image is being loaded from file).
   bool image_is_stub() const { return image_is_stub_; }
 
   // True if image is being loaded from file.
   bool image_is_loading() const { return image_is_loading_; }
 
   // OAuth token status for this user.
   OAuthTokenStatus oauth_token_status() const { return oauth_token_status_; }
 
@@ skipping 39 matching lines @@
   static User* CreatePublicAccountUser(const AccountId& account_id);
 
   explicit User(const AccountId& account_id);
   ~User() override;
 
   const std::string* GetAccountLocale() const { return account_locale_.get(); }
 
   // Setters are private so only UserManager can call them.
   void SetAccountLocale(const std::string& resolved_account_locale);
 
-  void SetImage(const UserImage& user_image, int image_index);
+  void SetImage(scoped_ptr<UserImage> user_image, int image_index);
 
   void SetImageURL(const GURL& image_url);
 
   // Sets a stub image until the next |SetImage| call. |image_index| may be
   // one of |USER_IMAGE_EXTERNAL| or |USER_IMAGE_PROFILE|.
   // If |is_loading| is |true|, that means user image is being loaded from file.
-  void SetStubImage(const UserImage& stub_user_image,
+  void SetStubImage(scoped_ptr<UserImage> stub_user_image,
                     int image_index,
                     bool is_loading);
 
   void set_display_name(const base::string16& display_name) {
     display_name_ = display_name;
   }
 
   void set_given_name(const base::string16& given_name) {
     given_name_ = given_name;
   }
 
   void set_display_email(const std::string& display_email) {
     display_email_ = display_email;
   }
 
   void set_using_saml(const bool using_saml) { using_saml_ = using_saml; }
 
-  const UserImage& user_image() const { return user_image_; }
+  const UserImage& user_image() const { return *user_image_; }

[achuithb, 2016/03/18 18:57:47]

The method name should be GetUserImage since it is no longer a simple getter.

[satorux1, 2016/03/18 22:46:36]

I think it's ok to keep the name as is because the function is still simple and
cheap:

https://google.github.io/styleguide/cppguide.html#Function_Names

Functions that are very cheap to call may instead follow the style for variable
names (all lower-case, with underscores between words). 

 
   void set_oauth_token_status(OAuthTokenStatus status) {
     oauth_token_status_ = status;
   }
 
   void set_force_online_signin(bool force_online_signin) {
     force_online_signin_ = force_online_signin;
   }
 
   void set_username_hash(const std::string& username_hash) {
@@ skipping 13 matching lines @@
 
   virtual void SetAffiliation(bool is_affiliated);
 
  private:
   AccountId account_id_;
   base::string16 display_name_;
   base::string16 given_name_;
   // The displayed user email, defaults to |email_|.
   std::string display_email_;
   bool using_saml_ = false;
-  UserImage user_image_;
+  scoped_ptr<UserImage> user_image_;
   OAuthTokenStatus oauth_token_status_ = OAUTH_TOKEN_STATUS_UNKNOWN;
   bool force_online_signin_ = false;
 
   // This is set to chromeos locale if account data has been downloaded.
   // (Or failed to download, but at least one download attempt finished).
   // An empty string indicates error in data load, or in
   // translation of Account locale to chromeos locale.
   scoped_ptr<std::string> account_locale_;
 
   // Used to identify homedir mount point.
@@ skipping 26 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 using UserList = std::vector<User*>;
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_H_