UserManager stack refactoring.

components/user_manager/fake_user_manager.cc

Index: components/user_manager/fake_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.cc b/components/user_manager/fake_user_manager.cc
similarity index 67%
rename from chrome/browser/chromeos/login/users/fake_user_manager.cc
rename to components/user_manager/fake_user_manager.cc
index fac64ea347611db640da1f8f87e6a703a8e20363..4ffc77726a1d7985525d313ecedeacba0b728a0f 100644
--- a/chrome/browser/chromeos/login/users/fake_user_manager.cc
+++ b/components/user_manager/fake_user_manager.cc
@@ -1,14 +1,11 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "components/user_manager/fake_user_manager.h"
 
+#include "base/callback.h"
 #include "base/task_runner.h"
-#include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/grit/theme_resources.h"
-#include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_type.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -17,8 +14,8 @@ namespace {
 class FakeTaskRunner : public base::TaskRunner {
  public:
   bool PostDelayedTask(const tracked_objects::Location& from_here,
-                       const base::Closure& task,
-                       base::TimeDelta delay) override {
+                               const base::Closure& task,

[Nikita (slow), 2015/01/20 18:18:22]

nit: please run git cl format for your CL

[merkulova, 2015/01/21 14:10:34]

Done.

+                               base::TimeDelta delay) override {
     task.Run();
     return true;
   }
@@ -30,13 +27,12 @@ class FakeTaskRunner : public base::TaskRunner {
 
 }  // namespace
 
-namespace chromeos {
+namespace user_manager {
 
 FakeUserManager::FakeUserManager()
-    : ChromeUserManager(new FakeTaskRunner(), new FakeTaskRunner()),
-      supervised_user_manager_(new FakeSupervisedUserManager),
+    : UserManagerBase(new FakeTaskRunner(), new FakeTaskRunner()),
       primary_user_(NULL),
-      multi_profile_user_controller_(NULL) {
+      owner_email_("") {

[Nikita (slow), 2015/01/20 18:18:22]

nit: std::string()

[merkulova, 2015/01/21 14:10:34]

Done.

 }
 
 FakeUserManager::~FakeUserManager() {
@@ -50,39 +46,10 @@ FakeUserManager::~FakeUserManager() {
 
 const user_manager::User* FakeUserManager::AddUser(const std::string& email) {
   user_manager::User* user = user_manager::User::CreateRegularUser(email);
-  user->set_username_hash(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
-  user->SetStubImage(user_manager::UserImage(
-                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                             IDR_PROFILE_PICTURE_LOADING)),
-                     user_manager::User::USER_IMAGE_PROFILE,
-                     false);
   user_list_.push_back(user);
   return user;
 }
 
-const user_manager::User* FakeUserManager::AddPublicAccountUser(
-    const std::string& email) {
-  user_manager::User* user = user_manager::User::CreatePublicAccountUser(email);
-  user->set_username_hash(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
-  user->SetStubImage(user_manager::UserImage(
-                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                             IDR_PROFILE_PICTURE_LOADING)),
-                     user_manager::User::USER_IMAGE_PROFILE,
-                     false);
-  user_list_.push_back(user);
-  return user;
-}
-
-void FakeUserManager::AddKioskAppUser(const std::string& kiosk_app_username) {
-  user_manager::User* user =
-      user_manager::User::CreateKioskAppUser(kiosk_app_username);
-  user->set_username_hash(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(kiosk_app_username));
-  user_list_.push_back(user);
-}
-
 void FakeUserManager::RemoveUserFromList(const std::string& email) {
   user_manager::UserList::iterator it = user_list_.begin();
   while (it != user_list_.end() && (*it)->email() != email) ++it;
@@ -92,11 +59,6 @@ void FakeUserManager::RemoveUserFromList(const std::string& email) {
   }
 }
 
-void FakeUserManager::LoginUser(const std::string& email) {
-  UserLoggedIn(
-      email, ProfileHelper::GetUserIdHashByUserIdForTesting(email), false);
-}
-
 const user_manager::UserList& FakeUserManager::GetUsers() const {
   return user_list_;
 }
@@ -113,11 +75,6 @@ user_manager::UserList FakeUserManager::GetUsersAllowedForMultiProfile() const {
   return result;
 }
 
-user_manager::UserList
-FakeUserManager::GetUsersAllowedForSupervisedUsersCreation() const {
-  return ChromeUserManager::GetUsersAllowedAsSupervisedUserManagers(user_list_);
-}
-
 const user_manager::UserList& FakeUserManager::GetLoggedInUsers() const {
   return logged_in_users_;
 }
@@ -164,15 +121,6 @@ user_manager::User* FakeUserManager::GetActiveUser() {
 }
 
 void FakeUserManager::SwitchActiveUser(const std::string& email) {
-  active_user_id_ = email;
-  ProfileHelper::Get()->ActiveUserHashChanged(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
-  if (user_list_.size() && !active_user_id_.empty()) {
-    for (user_manager::UserList::const_iterator it = user_list_.begin();
-         it != user_list_.end(); ++it) {
-      (*it)->set_is_active((*it)->email() == active_user_id_);
-    }
-  }
 }
 
 void FakeUserManager::SaveUserDisplayName(
@@ -188,19 +136,6 @@ void FakeUserManager::SaveUserDisplayName(
   }
 }
 
-MultiProfileUserController* FakeUserManager::GetMultiProfileUserController() {
-  return multi_profile_user_controller_;
-}
-
-SupervisedUserManager* FakeUserManager::GetSupervisedUserManager() {
-  return supervised_user_manager_.get();
-}
-
-UserImageManager* FakeUserManager::GetUserImageManager(
-    const std::string& /* user_id */) {
-  return NULL;
-}
-
 const user_manager::UserList& FakeUserManager::GetLRULoggedInUsers() const {
   return user_list_;
 }
@@ -312,14 +247,6 @@ bool FakeUserManager::IsUserNonCryptohomeDataEphemeral(
   return false;
 }
 
-UserFlow* FakeUserManager::GetCurrentUserFlow() const {
-  return NULL;
-}
-
-UserFlow* FakeUserManager::GetUserFlow(const std::string& email) const {
-  return NULL;
-}
-
 bool FakeUserManager::AreSupervisedUsersAllowed() const {
   return true;
 }
@@ -354,4 +281,4 @@ bool FakeUserManager::IsPublicAccountMarkedForRemoval(
   return false;
 }
 
-}  // namespace chromeos
+}  // namespace user_manager