[cros] Move User class to user_manager component.

chrome/browser/chromeos/login/users/fake_user_manager.cc

Index: chrome/browser/chromeos/login/users/fake_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.cc b/chrome/browser/chromeos/login/users/fake_user_manager.cc
index 53498f05351298370dae64c46d9d35584a421f60..56326a68e3e4737b6282625366a6a4b71f78aa7e 100644
--- a/chrome/browser/chromeos/login/users/fake_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/fake_user_manager.cc
@@ -6,7 +6,10 @@
 
 #include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_type.h"
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
@@ -28,39 +31,50 @@ FakeUserManager::~FakeUserManager() {
   ProfileHelper::SetProfileToUserForTestingEnabled(false);
 
   // Can't use STLDeleteElements because of the private destructor of User.
-  for (UserList::iterator it = user_list_.begin(); it != user_list_.end();
+  for (user_manager::UserList::iterator it = user_list_.begin();
+       it != user_list_.end();
        it = user_list_.erase(it)) {
     delete *it;
   }
 }
 
-const User* FakeUserManager::AddUser(const std::string& email) {
-  User* user = User::CreateRegularUser(email);
+const user_manager::User* FakeUserManager::AddUser(const std::string& email) {
+  user_manager::User* user = user_manager::User::CreateRegularUser(email);
   user->set_username_hash(email + kUserIdHashSuffix);
-  user->SetStubImage(User::kProfileImageIndex, false);
+  user->SetStubImage(user_manager::UserImage(
+                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                             IDR_PROFILE_PICTURE_LOADING)),
+                     user_manager::User::USER_IMAGE_PROFILE,
+                     false);
   user_list_.push_back(user);
   ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
   return user;
 }
 
-const User* FakeUserManager::AddPublicAccountUser(const std::string& email) {
-  User* user = User::CreatePublicAccountUser(email);
+const user_manager::User* FakeUserManager::AddPublicAccountUser(
+    const std::string& email) {
+  user_manager::User* user = user_manager::User::CreatePublicAccountUser(email);
   user->set_username_hash(email + kUserIdHashSuffix);
-  user->SetStubImage(User::kProfileImageIndex, false);
+  user->SetStubImage(user_manager::UserImage(
+                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                             IDR_PROFILE_PICTURE_LOADING)),
+                     user_manager::User::USER_IMAGE_PROFILE,
+                     false);
   user_list_.push_back(user);
   ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
   return user;
 }
 
 void FakeUserManager::AddKioskAppUser(const std::string& kiosk_app_username) {
-  User* user = User::CreateKioskAppUser(kiosk_app_username);
+  user_manager::User* user =
+      user_manager::User::CreateKioskAppUser(kiosk_app_username);
   user->set_username_hash(kiosk_app_username + kUserIdHashSuffix);
   user_list_.push_back(user);
   ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
 }
 
 void FakeUserManager::RemoveUserFromList(const std::string& email) {
-  UserList::iterator it = user_list_.begin();
+  user_manager::UserList::iterator it = user_list_.begin();
   while (it != user_list_.end() && (*it)->email() != email) ++it;
   if (it != user_list_.end()) {
     delete *it;
@@ -72,13 +86,14 @@ void FakeUserManager::LoginUser(const std::string& email) {
   UserLoggedIn(email, email + kUserIdHashSuffix, false);
 }
 
-const UserList& FakeUserManager::GetUsers() const {
+const user_manager::UserList& FakeUserManager::GetUsers() const {
   return user_list_;
 }
 
-UserList FakeUserManager::GetUsersAdmittedForMultiProfile() const {
-  UserList result;
-  for (UserList::const_iterator it = user_list_.begin();
+user_manager::UserList FakeUserManager::GetUsersAdmittedForMultiProfile()
+    const {
+  user_manager::UserList result;
+  for (user_manager::UserList::const_iterator it = user_list_.begin();
        it != user_list_.end();
        ++it) {
     if ((*it)->GetType() == user_manager::USER_TYPE_REGULAR &&
@@ -88,14 +103,14 @@ UserList FakeUserManager::GetUsersAdmittedForMultiProfile() const {
   return result;
 }
 
-const UserList& FakeUserManager::GetLoggedInUsers() const {
+const user_manager::UserList& FakeUserManager::GetLoggedInUsers() const {
   return logged_in_users_;
 }
 
 void FakeUserManager::UserLoggedIn(const std::string& email,
                                    const std::string& username_hash,
                                    bool browser_restart) {
-  for (UserList::const_iterator it = user_list_.begin();
+  for (user_manager::UserList::const_iterator it = user_list_.begin();
        it != user_list_.end();
        ++it) {
     if ((*it)->username_hash() == username_hash) {
@@ -109,11 +124,12 @@ void FakeUserManager::UserLoggedIn(const std::string& email,
   }
 }
 
-User* FakeUserManager::GetActiveUserInternal() const {
+user_manager::User* FakeUserManager::GetActiveUserInternal() const {
   if (user_list_.size()) {
     if (!active_user_id_.empty()) {
-      for (UserList::const_iterator it = user_list_.begin();
-           it != user_list_.end(); ++it) {
+      for (user_manager::UserList::const_iterator it = user_list_.begin();
+           it != user_list_.end();
+           ++it) {
         if ((*it)->email() == active_user_id_)
           return *it;
       }
@@ -123,11 +139,11 @@ User* FakeUserManager::GetActiveUserInternal() const {
   return NULL;
 }
 
-const User* FakeUserManager::GetActiveUser() const {
+const user_manager::User* FakeUserManager::GetActiveUser() const {
   return GetActiveUserInternal();
 }
 
-User* FakeUserManager::GetActiveUser() {
+user_manager::User* FakeUserManager::GetActiveUser() {
   return GetActiveUserInternal();
 }
 
@@ -138,8 +154,9 @@ void FakeUserManager::SwitchActiveUser(const std::string& email) {
 void FakeUserManager::SaveUserDisplayName(
     const std::string& username,
     const base::string16& display_name) {
-  for (UserList::iterator it = user_list_.begin();
-       it != user_list_.end(); ++it) {
+  for (user_manager::UserList::iterator it = user_list_.begin();
+       it != user_list_.end();
+       ++it) {
     if ((*it)->email() == username) {
       (*it)->set_display_name(display_name);
       return;
@@ -160,11 +177,11 @@ UserImageManager* FakeUserManager::GetUserImageManager(
   return NULL;
 }
 
-const UserList& FakeUserManager::GetLRULoggedInUsers() {
+const user_manager::UserList& FakeUserManager::GetLRULoggedInUsers() {
   return user_list_;
 }
 
-UserList FakeUserManager::GetUnlockUsers() const {
+user_manager::UserList FakeUserManager::GetUnlockUsers() const {
   return user_list_;
 }
 
@@ -176,28 +193,32 @@ bool FakeUserManager::IsKnownUser(const std::string& email) const {
   return true;
 }
 
-const User* FakeUserManager::FindUser(const std::string& email) const {
-  const UserList& users = GetUsers();
-  for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
+const user_manager::User* FakeUserManager::FindUser(
+    const std::string& email) const {
+  const user_manager::UserList& users = GetUsers();
+  for (user_manager::UserList::const_iterator it = users.begin();
+       it != users.end();
+       ++it) {
     if ((*it)->email() == email)
       return *it;
   }
   return NULL;
 }
 
-User* FakeUserManager::FindUserAndModify(const std::string& email) {
+user_manager::User* FakeUserManager::FindUserAndModify(
+    const std::string& email) {
   return NULL;
 }
 
-const User* FakeUserManager::GetLoggedInUser() const {
+const user_manager::User* FakeUserManager::GetLoggedInUser() const {
   return NULL;
 }
 
-User* FakeUserManager::GetLoggedInUser() {
+user_manager::User* FakeUserManager::GetLoggedInUser() {
   return NULL;
 }
 
-const User* FakeUserManager::GetPrimaryUser() const {
+const user_manager::User* FakeUserManager::GetPrimaryUser() const {
   return primary_user_;
 }
 
@@ -252,7 +273,7 @@ bool FakeUserManager::IsLoggedInAsSupervisedUser() const {
 }
 
 bool FakeUserManager::IsLoggedInAsKioskApp() const {
-  const User* active_user = GetActiveUser();
+  const user_manager::User* active_user = GetActiveUser();
   return active_user
              ? active_user->GetType() == user_manager::USER_TYPE_KIOSK_APP
              : false;