Move UserImage to user_manager

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index 8d31aae557d21350783eff6b0113c2869a0ac7ea..2ff9d0ab82a1cdb61a02dd40d19ba578a85ada62 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
@@ -25,13 +25,13 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
-#include "chrome/browser/chromeos/login/users/avatar/user_image.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
+#include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
@@ -155,11 +155,12 @@ int ImageIndexToHistogramIndex(int image_index) {
   }
 }
 
-bool SaveImage(const UserImage& user_image, const base::FilePath& image_path) {
-  UserImage safe_image;
-  const UserImage::RawImage* encoded_image = NULL;
+bool SaveImage(const user_manager::UserImage& user_image,
+               const base::FilePath& image_path) {
+  user_manager::UserImage safe_image;
+  const user_manager::UserImage::RawImage* encoded_image = NULL;
   if (!user_image.is_safe_format()) {
-    safe_image = UserImage::CreateAndEncode(user_image.image());
+    safe_image = user_manager::UserImage::CreateAndEncode(user_image.image());
     encoded_image = &safe_image.raw_image();
     UMA_HISTOGRAM_MEMORY_KB("UserImage.RecodedJpegSize", encoded_image->size());
   } else if (user_image.has_raw_image()) {
@@ -216,7 +217,7 @@ class UserImageManagerImpl::Job {
 
   // Saves the |user_image| to disk and sets the user image in local
   // state to that image. Also updates the user with the new image.
-  void SetToImage(int image_index, const UserImage& user_image);
+  void SetToImage(int image_index, const user_manager::UserImage& user_image);
 
   // Decodes the JPEG image |data|, crops and resizes the image, saves
   // it to disk and sets the user image in local state to that image.
@@ -235,7 +236,7 @@ class UserImageManagerImpl::Job {
 
  private:
   // Called back after an image has been loaded from disk.
-  void OnLoadImageDone(bool save, const UserImage& user_image);
+  void OnLoadImageDone(bool save, const user_manager::UserImage& user_image);
 
   // Updates the user object with |user_image_|.
   void UpdateUser();
@@ -272,7 +273,7 @@ class UserImageManagerImpl::Job {
   GURL image_url_;
   base::FilePath image_path_;
 
-  UserImage user_image_;
+  user_manager::UserImage user_image_;
 
   base::WeakPtrFactory<Job> weak_factory_;
 
@@ -300,7 +301,7 @@ void UserImageManagerImpl::Job::LoadImage(base::FilePath image_path,
 
   if (image_index_ >= 0 && image_index_ < kDefaultImagesCount) {
     // Load one of the default images. This happens synchronously.
-    user_image_ = UserImage(GetDefaultImage(image_index_));
+    user_image_ = user_manager::UserImage(GetDefaultImage(image_index_));
     UpdateUser();
     NotifyJobDone();
   } else if (image_index_ == User::kExternalImageIndex ||
@@ -329,15 +330,16 @@ void UserImageManagerImpl::Job::SetToDefaultImage(int default_image_index) {
   DCHECK_GT(kDefaultImagesCount, default_image_index);
 
   image_index_ = default_image_index;
-  user_image_ = UserImage(GetDefaultImage(image_index_));
+  user_image_ = user_manager::UserImage(GetDefaultImage(image_index_));
 
   UpdateUser();
   UpdateLocalState();
   NotifyJobDone();
 }
 
-void UserImageManagerImpl::Job::SetToImage(int image_index,
-                                           const UserImage& user_image) {
+void UserImageManagerImpl::Job::SetToImage(
+    int image_index,
+    const user_manager::UserImage& user_image) {
   DCHECK(!run_);
   run_ = true;
 
@@ -392,8 +394,9 @@ void UserImageManagerImpl::Job::SetToPath(const base::FilePath& path,
                                                   true));
 }
 
-void UserImageManagerImpl::Job::OnLoadImageDone(bool save,
-                                                const UserImage& user_image) {
+void UserImageManagerImpl::Job::OnLoadImageDone(
+    bool save,
+    const user_manager::UserImage& user_image) {
   user_image_ = user_image;
   UpdateUser();
   if (save)
@@ -519,7 +522,7 @@ void UserImageManagerImpl::LoadUserImage() {
   int image_index = User::kInvalidImageIndex;
   image_properties->GetInteger(kImageIndexNodeName, &image_index);
   if (image_index >= 0 && image_index < kDefaultImagesCount) {
-    user->SetImage(UserImage(GetDefaultImage(image_index)),
+    user->SetImage(user_manager::UserImage(GetDefaultImage(image_index)),
                    image_index);
     return;
   }
@@ -625,7 +628,8 @@ void UserImageManagerImpl::SaveUserDefaultImageIndex(int default_image_index) {
   job_->SetToDefaultImage(default_image_index);
 }
 
-void UserImageManagerImpl::SaveUserImage(const UserImage& user_image) {
+void UserImageManagerImpl::SaveUserImage(
+    const user_manager::UserImage& user_image) {
   if (IsUserImageManaged())
     return;
   job_.reset(new Job(this));
@@ -646,9 +650,10 @@ void UserImageManagerImpl::SaveUserImageFromProfileImage() {
   // stub image (gray avatar).
   job_.reset(new Job(this));
   job_->SetToImage(User::kProfileImageIndex,
-                   downloaded_profile_image_.isNull() ?
-                       UserImage() :
-                       UserImage::CreateAndEncode(downloaded_profile_image_));
+                   downloaded_profile_image_.isNull()
+                       ? user_manager::UserImage()
+                       : user_manager::UserImage::CreateAndEncode(
+                             downloaded_profile_image_));
   // If no profile image has been downloaded yet, ensure that a download is
   // started.
   if (downloaded_profile_image_.isNull())