Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/wm/session_state_controller_impl2_unittest.cc

Index: trunk/src/ash/wm/session_state_controller_impl2_unittest.cc
===================================================================
--- trunk/src/ash/wm/session_state_controller_impl2_unittest.cc	(revision 194588)
+++ trunk/src/ash/wm/session_state_controller_impl2_unittest.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "ash/wm/session_state_controller_impl2.h"
 
 #include "ash/ash_switches.h"
-#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ -138,7 +137,6 @@
             animator_.get()));
     shell_delegate_ = reinterpret_cast<TestShellDelegate*>(
         ash::Shell::GetInstance()->delegate());
-    state_delegate_ = Shell::GetInstance()->session_state_delegate();
   }
 
   virtual void TearDown() {
@@ -312,7 +310,7 @@
 
   void ExpectUnlockedState() {
     //TODO (antrim) : restore EXPECT_FALSE(animator_helper_->IsAnimating());
-    EXPECT_FALSE(state_delegate_->IsScreenLocked());
+    EXPECT_FALSE(shell_delegate_->IsScreenLocked());
 
     aura::Window::Windows containers;
 
@@ -333,7 +331,7 @@
 
   void ExpectLockedState() {
     //TODO (antrim) : restore EXPECT_FALSE(animator_helper_->IsAnimating());
-    EXPECT_TRUE(state_delegate_->IsScreenLocked());
+    EXPECT_TRUE(shell_delegate_->IsScreenLocked());
 
     aura::Window::Windows containers;
 
@@ -372,7 +370,7 @@
 
   void SystemLocks() {
     state_controller_->OnLockStateChanged(true);
-    state_delegate_->LockScreen();
+    shell_delegate_->LockScreen();
     //TODO (antrim) : restore animator_helper_->Advance(base::TimeDelta());
   }
 
@@ -384,7 +382,7 @@
 
   void SystemUnlocks() {
     state_controller_->OnLockStateChanged(false);
-    state_delegate_->UnlockScreen();
+    shell_delegate_->UnlockScreen();
     //TODO (antrim) : restore animator_helper_->Advance(base::TimeDelta());
   }
 
@@ -401,7 +399,6 @@
   SessionStateControllerImpl2* state_controller_;  // not owned
   TestSessionStateControllerDelegate* delegate_;  // not owned
   TestShellDelegate* shell_delegate_;  // not owned
-  SessionStateDelegate* state_delegate_;  // not owned
 
   scoped_ptr<ui::ScopedAnimationDurationScaleMode> animation_duration_mode_;
   scoped_ptr<SessionStateControllerImpl2::TestApi> test_api_;