UserManager stack refactoring.

chrome/browser/chromeos/login/users/chrome_user_manager.h

Index: chrome/browser/chromeos/login/users/chrome_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager.h b/chrome/browser/chromeos/login/users/chrome_user_manager.h
index 5ec3b8fda71ec34eb7cc859a3146bcdf73dc4759..d97d2d75c16d615bb18d34130520498891febd46 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager.h
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager.h
@@ -6,22 +6,16 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_
 
 #include "base/basictypes.h"
-#include "components/user_manager/user.h"
+#include "base/memory/ref_counted.h"
+#include "base/task_runner.h"
+#include "chrome/browser/chromeos/login/users/user_manager_interface.h"
 #include "components/user_manager/user_manager_base.h"
 
-namespace base {
-class TaskRunner;
-}
-
 namespace chromeos {
 
-class MultiProfileUserController;
-class SupervisedUserManager;
-class UserFlow;
-class UserImageManager;
-
 // Chrome specific interface of the UserManager.
-class ChromeUserManager : public user_manager::UserManagerBase {
+class ChromeUserManager : public user_manager::UserManagerBase,
+                          public UserManagerInterface {
  public:
   ChromeUserManager(scoped_refptr<base::TaskRunner> task_runner,
                     scoped_refptr<base::TaskRunner> blocking_task_runner);
@@ -36,29 +30,6 @@ class ChromeUserManager : public user_manager::UserManagerBase {
   static user_manager::UserList GetUsersAllowedAsSupervisedUserManagers(
       const user_manager::UserList& user_list);
 
-  virtual MultiProfileUserController* GetMultiProfileUserController() = 0;
-  virtual UserImageManager* GetUserImageManager(const std::string& user_id) = 0;
-  virtual SupervisedUserManager* GetSupervisedUserManager() = 0;
-
-  // Method that allows to set |flow| for user identified by |user_id|.
-  // Flow should be set before login attempt.
-  // Takes ownership of the |flow|, |flow| will be deleted in case of login
-  // failure.
-  virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) = 0;
-
-  // Return user flow for current user. Returns instance of DefaultUserFlow if
-  // no flow was defined for current user, or user is not logged in.
-  // Returned value should not be cached.
-  virtual UserFlow* GetCurrentUserFlow() const = 0;
-
-  // Return user flow for user identified by |user_id|. Returns instance of
-  // DefaultUserFlow if no flow was defined for user.
-  // Returned value should not be cached.
-  virtual UserFlow* GetUserFlow(const std::string& user_id) const = 0;
-
-  // Resets user flow for user identified by |user_id|.
-  virtual void ResetUserFlow(const std::string& user_id) = 0;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManager);
 };