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..99e7224161430f6241636f4ac4b1e8c04c9ba8d7 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager.h
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager.h
@@ -6,22 +6,15 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_
 
 #include "base/basictypes.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager_interface.h"
 #include "components/user_manager/user.h"

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

It seems that you don't need to include "components/user_manager/user.h" here.

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

Done.

 #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 ChromeUserManagerInterface {
  public:
   ChromeUserManager(scoped_refptr<base::TaskRunner> task_runner,

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

#include "base/memory/ref_counted.h"
#include "base/task_runner.h"

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

Done.

                     scoped_refptr<base::TaskRunner> blocking_task_runner);
@@ -31,34 +24,6 @@ class ChromeUserManager : public user_manager::UserManagerBase {
   // yet initialized.
   static ChromeUserManager* Get();
 
-  // Helper method for sorting out of user list only users that can create
-  // supervised users.
-  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);
 };