ash: Use SessionController instead of SessionStateDelegate

ash/common/test/test_session_state_delegate.h

Index: ash/common/test/test_session_state_delegate.h
diff --git a/ash/common/test/test_session_state_delegate.h b/ash/common/test/test_session_state_delegate.h
index eb71d540f849290862a1fa8359f04aba10dc4d61..40575afd9bb54ee6a516a1ef3270b141cbf1d323 100644
--- a/ash/common/test/test_session_state_delegate.h
+++ b/ash/common/test/test_session_state_delegate.h
@@ -5,113 +5,27 @@
 #ifndef ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_
 #define ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_
 
-#include <memory>
-#include <vector>
-
 #include "ash/common/session/session_state_delegate.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/gfx/image/image_skia.h"
 
-class AccountId;
-
 namespace ash {
 namespace test {
 
-class MockUserInfo;
-
 class TestSessionStateDelegate : public SessionStateDelegate {
  public:
   TestSessionStateDelegate();
   ~TestSessionStateDelegate() override;
 
-  void set_logged_in_users(int users) { logged_in_users_ = users; }
-  void set_session_state(session_manager::SessionState session_state) {
-    session_state_ = session_state;
-  }
-  void AddUser(const AccountId& account_id);
-  const user_manager::UserInfo* GetActiveUserInfo() const;
-
   // SessionStateDelegate:
-  int GetMaximumNumberOfLoggedInUsers() const override;
-  int NumberOfLoggedInUsers() const override;
-  bool IsActiveUserSessionStarted() const override;
-  bool CanLockScreen() const override;
-  bool IsScreenLocked() const override;
-  bool ShouldLockScreenAutomatically() const override;
-  void LockScreen() override;
-  void UnlockScreen() override;
-  bool IsUserSessionBlocked() const override;
-  session_manager::SessionState GetSessionState() const override;
-  const user_manager::UserInfo* GetUserInfo(
-      ash::UserIndex index) const override;
   bool ShouldShowAvatar(WmWindow* window) const override;
   gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override;
-  void SwitchActiveUser(const AccountId& account_id) override;
-  void CycleActiveUser(CycleUserDirection direction) override;
-  bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;
-  void AddSessionStateObserver(ash::SessionStateObserver* observer) override;
-  void RemoveSessionStateObserver(ash::SessionStateObserver* observer) override;
-
-  // TODO(oshima): Use state machine instead of using boolean variables.
-
-  // Updates the internal state that indicates whether a session is in progress
-  // and there is an active user. If |has_active_user| is |false|,
-  // |active_user_session_started_| is reset to |false| as well (see below for
-  // the difference between these two flags).
-  void SetHasActiveUser(bool has_active_user);
-
-  // Updates the internal state that indicates whether the session has been
-  // fully started for the active user. If |active_user_session_started| is
-  // |true|, |has_active_user_| is set to |true| as well (see below for the
-  // difference between these two flags).
-  void SetActiveUserSessionStarted(bool active_user_session_started);
-
-  // Updates the internal state that indicates whether the screen can be locked.
-  // Locking will only actually be allowed when this value is |true| and there
-  // is an active user.
-  static void SetCanLockScreen(bool can_lock_screen);
-
-  // Updates |should_lock_screen_automatically_|.
-  void SetShouldLockScreenAutomatically(bool should_lock);
-
-  // Updates the internal state that indicates whether user adding screen is
-  // running now.
-  void SetUserAddingScreenRunning(bool user_adding_screen_running);
 
   // Setting non NULL image enables avatar icon.
   void SetUserImage(const gfx::ImageSkia& user_image);
 
  private:
-  class TestUserManager;
-
-  // Whether the screen can be locked. Locking will only actually be allowed
-  // when this is |true| and there is an active user.
-  bool can_lock_screen_;
-
-  // Return value for ShouldLockScreenAutomatically().
-  bool should_lock_screen_automatically_;
-
-  // Whether the screen is currently locked.
-  bool screen_locked_;
-
-  // Whether user addding screen is running now.
-  bool user_adding_screen_running_;
-
-  // The number of users logged in.
-  int logged_in_users_;
-
-  // The index for the activated user.
-  int active_user_index_;
-
-  std::vector<std::unique_ptr<MockUserInfo>> user_list_;
-
-  // The user manager to be used instead of the system instance.
-  std::unique_ptr<TestUserManager> user_manager_;
-
-  // The current state of the login screen. |session_state_| becomes active
-  // before the profile and browser UI are available.
-  session_manager::SessionState session_state_;
+  gfx::ImageSkia user_image_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
 };