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

chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc

Index: chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
index 2d1bc91d1962fd3f40f46c3fc96607512582c53d..88bf0462b1cf53b3f41157438bc8bc6b23219f78 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
@@ -38,6 +40,11 @@ class MultiUserNotificationBlockerChromeOSTest
     shell_delegate->set_multi_profiles_enabled(true);
     chrome::MultiUserWindowManager::CreateInstance();
 
+    ash::test::TestSessionStateDelegate* session_state_delegate =
+        static_cast<ash::test::TestSessionStateDelegate*>(
+            ash::Shell::GetInstance()->session_state_delegate());
+    session_state_delegate->AddUser("test2@example.com");
+
     // Disable any animations for the test.
     GetMultiUserWindowManager()->SetAnimationSpeedForTest(
         chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
@@ -64,7 +71,10 @@ class MultiUserNotificationBlockerChromeOSTest
   }
 
   const std::string GetDefaultUserId() {
-    return ash::Shell::GetInstance()->session_state_delegate()->GetUserID(0);
+    return ash::Shell::GetInstance()
+        ->session_state_delegate()
+        ->GetUserInfo(0)
+        ->GetUserID();
   }
 
   const message_center::NotificationBlocker* blocker() {