Adding new user menu section to the SystemTrayMenu & refactoring of user access

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 807e3358cc1c249e6c3ccba1d20141aae65efca1..d91bd94e4e705527080da0fc596c9b476fed70da 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/test/test_session_state_delegate.h
@@ -8,6 +8,7 @@
 #include "ash/session_state_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace ash {
 namespace test {
@@ -18,12 +19,21 @@ class TestSessionStateDelegate : public SessionStateDelegate {
   virtual ~TestSessionStateDelegate();
 
   // SessionStateDelegate:
-  virtual bool HasActiveUser() const OVERRIDE;
+  virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
+  virtual int NumberOfLoggedInUsers() const OVERRIDE;
   virtual bool IsActiveUserSessionStarted() const OVERRIDE;
   virtual bool CanLockScreen() const OVERRIDE;
   virtual bool IsScreenLocked() const OVERRIDE;
   virtual void LockScreen() OVERRIDE;
   virtual void UnlockScreen() OVERRIDE;
+  virtual const base::string16 GetUserDisplayName(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual const std::string GetUserEmail(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual const gfx::ImageSkia& GetUserImage(
+      ash::MultiProfileIndex index) const OVERRIDE;
+  virtual void GetLoggedInUsers(UserEmailList* users) OVERRIDE;
+  virtual void SwitchActiveUser(const std::string& email) OVERRIDE;
 
   // Updates the internal state that indicates whether a session is in progress
   // and there is an active user. If |has_active_user| is |false|,
@@ -58,6 +68,9 @@ class TestSessionStateDelegate : public SessionStateDelegate {
   // Whether the screen is currently locked.
   bool screen_locked_;
 
+  // A test user image.
+  gfx::ImageSkia null_image_;
+
   DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
 };