Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc

Index: trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc
===================================================================
--- trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc	(revision 194588)
+++ trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc	(working copy)
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
-#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/bind.h"
@@ -109,7 +109,7 @@
   MockDispatcher inner_dispatcher;
   scoped_ptr<aura::Window> associated_window(CreateTestWindowInShellWithId(0));
 
-  Shell::GetInstance()->session_state_delegate()->LockScreen();
+  Shell::GetInstance()->delegate()->LockScreen();
   DispatchKeyReleaseA();
   aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
   aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
@@ -117,7 +117,7 @@
       associated_window.get(),
       true /* nestable_tasks_allowed */);
   EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
-  Shell::GetInstance()->session_state_delegate()->UnlockScreen();
+  Shell::GetInstance()->delegate()->UnlockScreen();
 }
 
 // Aura window above lock screen in z order.