[cros] Move User class to user_manager component.

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

Index: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
index 846a08d89924f9e5533a22a5eeba65c74ab39f1d..4a3e0ffade05b0f8d3e1e221348b669315ef1831 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
@@ -11,13 +11,13 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
-#include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
+#include "components/user_manager/user.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
@@ -33,7 +33,7 @@ const char kImageIndex[] = "image_index";
 bool IsIndexSupported(int index) {
   return (index >= user_manager::kFirstDefaultImageIndex &&
           index < user_manager::kDefaultImagesCount) ||
-         (index == User::kProfileImageIndex);
+         (index == user_manager::User::USER_IMAGE_PROFILE);
 }
 
 Profile* GetUserProfile() {
@@ -49,7 +49,7 @@ Profile* GetUserProfile() {
 
 UserImageSyncObserver::Observer::~Observer() {}
 
-UserImageSyncObserver::UserImageSyncObserver(const User* user)
+UserImageSyncObserver::UserImageSyncObserver(const user_manager::User* user)
     : user_(user),
       prefs_(NULL),
       is_synced_(false),
@@ -164,7 +164,7 @@ void UserImageSyncObserver::OnIsSyncingChanged() {
 void UserImageSyncObserver::UpdateSyncedImageFromLocal() {
   int local_index = user_->image_index();
   if (!IsIndexSupported(local_index)) {
-    local_index = User::kInvalidImageIndex;
+    local_index = user_manager::User::USER_IMAGE_INVALID;
   }
   int synced_index;
   if (GetSyncedImageIndex(&synced_index) && (synced_index == local_index))
@@ -183,7 +183,7 @@ void UserImageSyncObserver::UpdateLocalImageFromSynced() {
     return;
   UserImageManager* image_manager =
       UserManager::Get()->GetUserImageManager(user_->email());
-  if (synced_index == User::kProfileImageIndex) {
+  if (synced_index == user_manager::User::USER_IMAGE_PROFILE) {
     image_manager->SaveUserImageFromProfileImage();
   } else {
     image_manager->SaveUserDefaultImageIndex(synced_index);
@@ -192,7 +192,7 @@ void UserImageSyncObserver::UpdateLocalImageFromSynced() {
 }
 
 bool UserImageSyncObserver::GetSyncedImageIndex(int* index) {
-  *index = User::kInvalidImageIndex;
+  *index = user_manager::User::USER_IMAGE_INVALID;
   const base::DictionaryValue* dict = prefs_->GetDictionary(kUserImageInfo);
   return dict && dict->GetInteger(kImageIndex, index);
 }