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

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

Index: trunk/src/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc	(revision 267249)
+++ trunk/src/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc	(working copy)
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/session/session_state_delegate.h"
-#include "ash/session/user_info.h"
+#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/test/ash_test_base.h"
@@ -65,10 +64,7 @@
   }
 
   const std::string GetDefaultUserId() {
-    return ash::Shell::GetInstance()
-        ->session_state_delegate()
-        ->GetUserInfo(0)
-        ->GetUserID();
+    return ash::Shell::GetInstance()->session_state_delegate()->GetUserID(0);
   }
 
   const message_center::NotificationBlocker* blocker() {