UserManager stack refactoring.

components/user_manager/fake_user_manager.h

Index: components/user_manager/fake_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.h b/components/user_manager/fake_user_manager.h
similarity index 59%
rename from chrome/browser/chromeos/login/users/fake_user_manager.h
rename to components/user_manager/fake_user_manager.h
index c8397d4a2e2c9c230fd74444ccac6141d8ebb813..8b78d540c73248e80d63b6c1b743c10c9ead7188 100644
--- a/chrome/browser/chromeos/login/users/fake_user_manager.h
+++ b/components/user_manager/fake_user_manager.h
@@ -1,55 +1,36 @@
-// 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.
 
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
+#ifndef COMPONENTS_USER_MANAGER_FAKE_USER_MANAGER_H_
+#define COMPONENTS_USER_MANAGER_FAKE_USER_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/user_image.h"
+#include "components/user_manager/user_manager_base.h"
 
-namespace chromeos {
-
-class FakeSupervisedUserManager;
+namespace user_manager {
 
 // Fake user manager with a barebones implementation. Users can be added
 // and set as logged in, and those users can be returned.
-class FakeUserManager : public ChromeUserManager {
+class USER_MANAGER_EXPORT FakeUserManager : public UserManagerBase {
  public:
   FakeUserManager();
   ~FakeUserManager() override;
 
   // Create and add a new user.
-  const user_manager::User* AddUser(const std::string& email);
-
-  // Create and add a kiosk app user.
-  void AddKioskAppUser(const std::string& kiosk_app_username);
-
-  // Create and add a public account user.
-  const user_manager::User* AddPublicAccountUser(const std::string& email);
+  virtual const user_manager::User* AddUser(const std::string& email);
 
   // Calculates the user name hash and calls UserLoggedIn to login a user.
   void LoginUser(const std::string& email);
 
-  // ChromeUserManager overrides.
-  MultiProfileUserController* GetMultiProfileUserController() override;
-  UserImageManager* GetUserImageManager(const std::string& user_id) override;
-  SupervisedUserManager* GetSupervisedUserManager() override;
-  void SetUserFlow(const std::string& email, UserFlow* flow) override {}
-  UserFlow* GetCurrentUserFlow() const override;
-  UserFlow* GetUserFlow(const std::string& email) const override;
-  void ResetUserFlow(const std::string& email) override {}
-
   // UserManager overrides.
   const user_manager::UserList& GetUsers() const override;
-  user_manager::UserList GetUsersAllowedForMultiProfile() const override;
-  user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
+  user_manager::UserList GetUsersAllowedForMultiProfile()
       const override;
   const user_manager::UserList& GetLoggedInUsers() const override;
 
@@ -62,22 +43,26 @@ class FakeUserManager : public ChromeUserManager {
   user_manager::User* GetActiveUser() override;
   void SwitchActiveUser(const std::string& email) override;
   void SaveUserDisplayName(const std::string& username,
-                           const base::string16& display_name) override;
+      const base::string16& display_name) override;
 
   // Not implemented.
-  void UpdateUserAccountData(const std::string& user_id,
-                             const UserAccountData& account_data) override {}
+  void UpdateUserAccountData(
+      const std::string& user_id,
+      const UserAccountData& account_data) override {}
   void Shutdown() override {}
   const user_manager::UserList& GetLRULoggedInUsers() const override;
   user_manager::UserList GetUnlockUsers() const override;
   const std::string& GetOwnerEmail() const override;
   void SessionStarted() override {}
   void RemoveUser(const std::string& email,
-                  user_manager::RemoveUserDelegate* delegate) override {}
+                  user_manager::RemoveUserDelegate* delegate) override {
+  }
   void RemoveUserFromList(const std::string& email) override;
   bool IsKnownUser(const std::string& email) const override;
-  const user_manager::User* FindUser(const std::string& email) const override;
-  user_manager::User* FindUserAndModify(const std::string& email) override;
+  const user_manager::User* FindUser(
+      const std::string& email) const override;
+  user_manager::User* FindUserAndModify(
+      const std::string& email) override;
   const user_manager::User* GetLoggedInUser() const override;
   user_manager::User* GetLoggedInUser() override;
   const user_manager::User* GetPrimaryUser() const override;
@@ -86,10 +71,12 @@ class FakeUserManager : public ChromeUserManager {
       user_manager::User::OAuthTokenStatus oauth_token_status) override {}
   void SaveForceOnlineSignin(const std::string& user_id,
                              bool force_online_signin) override {}
-  base::string16 GetUserDisplayName(const std::string& username) const override;
+  base::string16 GetUserDisplayName(
+      const std::string& username) const override;
   void SaveUserDisplayEmail(const std::string& username,
-                            const std::string& display_email) override {}
-  std::string GetUserDisplayEmail(const std::string& username) const override;
+      const std::string& display_email) override {}
+  std::string GetUserDisplayEmail(
+      const std::string& username) const override;
   bool IsCurrentUserOwner() const override;
   bool IsCurrentUserNew() const override;
   bool IsCurrentUserNonCryptohomeDataEphemeral() const override;
@@ -106,8 +93,10 @@ class FakeUserManager : public ChromeUserManager {
       const std::string& email) const override;
   void AddObserver(Observer* obs) override {}
   void RemoveObserver(Observer* obs) override {}
-  void AddSessionStateObserver(UserSessionStateObserver* obs) override {}
-  void RemoveSessionStateObserver(UserSessionStateObserver* obs) override {}
+  void AddSessionStateObserver(
+      UserSessionStateObserver* obs) override {}
+  void RemoveSessionStateObserver(
+      UserSessionStateObserver* obs) override {}
   void NotifyLocalStateChanged() override {}
   bool AreSupervisedUsersAllowed() const override;
 
@@ -119,8 +108,8 @@ class FakeUserManager : public ChromeUserManager {
       const std::string& user_id,
       user_manager::User::OAuthTokenStatus status) const override {}
   bool IsEnterpriseManaged() const override;
-  void LoadPublicAccounts(std::set<std::string>* public_sessions_set) override {
-  }
+  void LoadPublicAccounts(
+      std::set<std::string>* public_sessions_set) override {}
   void PerformPreUserListLoadingActions() override {}
   void PerformPostUserListLoadingActions() override {}
   void PerformPostUserLoggedInActions(bool browser_restart) override {}
@@ -133,33 +122,25 @@ class FakeUserManager : public ChromeUserManager {
   void PublicAccountUserLoggedIn(user_manager::User* user) override {}
   void SupervisedUserLoggedIn(const std::string& user_id) override {}
 
-  void set_owner_email(const std::string& owner_email) {
-    owner_email_ = owner_email;
-  }
+ protected:
+   user_manager::UserList user_list_;
+   user_manager::UserList logged_in_users_;
 
-  void set_multi_profile_user_controller(
-      MultiProfileUserController* controller) {
-    multi_profile_user_controller_ = controller;
-  }
+   user_manager::User* primary_user_;
+   // If set this is the active user. If empty, the first created user is the

[ygorshenin1, 2015/01/20 18:33:40]

Nit: add an empty line before comment.

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

Done.

+   // active user.
+   std::string active_user_id_;

[ygorshenin1, 2015/01/20 18:33:40]

Why not to store a pointer to a user instead of string?

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

Left as discussed offline.

 
  private:
   // We use this internal function for const-correctness.
   user_manager::User* GetActiveUserInternal() const;
 
-  scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;
-  user_manager::UserList user_list_;
-  user_manager::UserList logged_in_users_;
+  // stub, always empty string.
   std::string owner_email_;

[ygorshenin1, 2015/01/20 18:33:40]

Why not to just return std::string() in GetOwnerEmail()?

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

Done.

-  user_manager::User* primary_user_;
-
-  // If set this is the active user. If empty, the first created user is the
-  // active user.
-  std::string active_user_id_;
-  MultiProfileUserController* multi_profile_user_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeUserManager);
 };
 
-}  // namespace chromeos
+}  // namespace user_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
+#endif  // COMPONENTS_USER_MANAGER_FAKE_USER_MANAGER_H_