CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

ash/test/test_session_state_delegate.h

Index: ash/test/test_session_state_delegate.h
diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h
index cceefa21a822c00e19739a79a59434c9680b2587..85f8b21ef2def21940a11125da09776e89ca2924 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/test/test_session_state_delegate.h
@@ -5,7 +5,9 @@
 #ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
 
-#include "ash/session_state_delegate.h"
+#include <vector>
+
+#include "ash/session/session_state_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/gfx/image/image_skia.h"
@@ -13,13 +15,15 @@
 namespace ash {
 namespace test {
 
+class MockUserInfo;
+
 class TestSessionStateDelegate : public SessionStateDelegate {
  public:
   TestSessionStateDelegate();
   virtual ~TestSessionStateDelegate();
 
   void set_logged_in_users(int users) { logged_in_users_ = users; }
-  const std::string& get_activated_user() { return activated_user_; }
+  const UserInfo* GetActiveUserInfo() const;
 
   // SessionStateDelegate:
   virtual content::BrowserContext* GetBrowserContextByIndex(
@@ -36,17 +40,11 @@ class TestSessionStateDelegate : public SessionStateDelegate {
   virtual void UnlockScreen() OVERRIDE;
   virtual bool IsUserSessionBlocked() const OVERRIDE;
   virtual SessionState GetSessionState() const OVERRIDE;
-  virtual const base::string16 GetUserDisplayName(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const base::string16 GetUserGivenName(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const std::string GetUserEmail(
-      ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const std::string GetUserID(
+  virtual const UserInfo* GetUserInfo(
       ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const gfx::ImageSkia& GetUserImage(
+  virtual const UserInfo* GetUserInfo(
       content::BrowserContext* context) const OVERRIDE;
-  virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
+  virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
   virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
   virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
   virtual void AddSessionStateObserver(
@@ -108,11 +106,10 @@ class TestSessionStateDelegate : public SessionStateDelegate {
   // The number of users logged in.
   int logged_in_users_;
 
-  // The activated user.
-  std::string activated_user_;
+  // The index for the activated user.
+  int active_user_index_;
 
-  // A test user image.
-  gfx::ImageSkia user_image_;
+  std::vector<MockUserInfo*> user_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
 };