Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/root_window_controller_unittest.cc

Index: trunk/src/ash/root_window_controller_unittest.cc
===================================================================
--- trunk/src/ash/root_window_controller_unittest.cc	(revision 194588)
+++ trunk/src/ash/root_window_controller_unittest.cc	(working copy)
@@ -5,9 +5,9 @@
 #include "ash/root_window_controller.h"
 
 #include "ash/display/display_controller.h"
-#include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
@@ -301,7 +301,7 @@
           controller->GetSystemModalLayoutManager(
               session_modal_widget->GetNativeView()));
 
-  shell->session_state_delegate()->LockScreen();
+  shell->delegate()->LockScreen();
   EXPECT_EQ(user::LOGGED_IN_LOCKED,
             shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
@@ -322,7 +322,7 @@
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 
-  shell->session_state_delegate()->UnlockScreen();
+  shell->delegate()->UnlockScreen();
 }
 
 TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
@@ -333,8 +333,8 @@
   SetUserLoggedIn(false);
   EXPECT_EQ(user::LOGGED_IN_NONE,
             shell->system_tray_delegate()->GetUserLoginStatus());
-  EXPECT_FALSE(shell->session_state_delegate()->HasActiveUser());
-  EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());
+  EXPECT_FALSE(shell->delegate()->IsUserLoggedIn());
+  EXPECT_FALSE(shell->delegate()->IsSessionStarted());
 
   internal::RootWindowController* controller =
       shell->GetPrimaryRootWindowController();
@@ -358,8 +358,8 @@
   SetSessionStarted(true);
   EXPECT_EQ(user::LOGGED_IN_USER,
             shell->system_tray_delegate()->GetUserLoginStatus());
-  EXPECT_TRUE(shell->session_state_delegate()->HasActiveUser());
-  EXPECT_TRUE(shell->session_state_delegate()->IsActiveUserSessionStarted());
+  EXPECT_TRUE(shell->delegate()->IsUserLoggedIn());
+  EXPECT_TRUE(shell->delegate()->IsSessionStarted());
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
       internal::kShellWindowId_SystemModalContainer)->layout_manager(),
           controller->GetSystemModalLayoutManager(NULL));