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

ash/system/user/tray_user_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
+#include "ash/session/user_info.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/tray_user_separator.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
@@ skipping 212 matching lines @@
 
 // Make sure that user changing gets properly executed.
 TEST_F(TrayUserTest, MutiUserModeButtonClicks) {
   // Have two users.
   InitializeParameters(2, true);
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ShowTrayMenu(&generator);
 
   // Switch to a new user - which has a capitalized name.
   ClickUserItem(&generator, 1);
-  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserID(1));
+  const UserInfo* active_user = delegate()->GetActiveUserInfo();
+  const UserInfo* second_user = delegate()->GetUserInfo(1);
+  EXPECT_EQ(active_user->GetID(), second_user->GetID());
   // Since the name is capitalized, the email should be different then the
   // user_id.
-  EXPECT_NE(delegate()->get_activated_user(), delegate()->GetUserEmail(1));
+  EXPECT_NE(active_user->GetID(), second_user->GetEmail());
   tray()->CloseSystemBubble();
 }
 
 #endif
 
 }  // namespace ash