Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/ash/test/test_session_state_delegate.h

Index: trunk/src/ash/test/test_session_state_delegate.h
===================================================================
--- trunk/src/ash/test/test_session_state_delegate.h	(revision 267249)
+++ trunk/src/ash/test/test_session_state_delegate.h	(working copy)
@@ -5,9 +5,7 @@
 #ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
 
-#include <vector>
-
-#include "ash/session/session_state_delegate.h"
+#include "ash/session_state_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/gfx/image/image_skia.h"
@@ -15,16 +13,13 @@
 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; }
-  void AddUser(const std::string user_id);
-  const UserInfo* GetActiveUserInfo() const;
+  const std::string& get_activated_user() { return activated_user_; }
 
   // SessionStateDelegate:
   virtual content::BrowserContext* GetBrowserContextByIndex(
@@ -41,11 +36,17 @@
   virtual void UnlockScreen() OVERRIDE;
   virtual bool IsUserSessionBlocked() const OVERRIDE;
   virtual SessionState GetSessionState() const OVERRIDE;
-  virtual const UserInfo* GetUserInfo(
+  virtual const base::string16 GetUserDisplayName(
       ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const UserInfo* GetUserInfo(
+  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(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual const gfx::ImageSkia& GetUserImage(
       content::BrowserContext* context) const OVERRIDE;
-  virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
+  virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
   virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
   virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
   virtual void AddSessionStateObserver(
@@ -107,10 +108,11 @@
   // The number of users logged in.
   int logged_in_users_;
 
-  // The index for the activated user.
-  int active_user_index_;
+  // The activated user.
+  std::string activated_user_;
 
-  std::vector<MockUserInfo*> user_list_;
+  // A test user image.
+  gfx::ImageSkia user_image_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
 };