ash: Use SessionController instead of SessionStateDelegate

ash/wm/lock_state_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/lock_state_controller.h"
 
 #include <memory>
 #include <utility>
 
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
 #include "ash/common/shutdown_controller.h"
-#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/test/test_session_controller_client.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/lock_state_controller_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_animator.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/session_state_animator.h"
@@ skipping 247 matching lines @@
     SCOPED_TRACE("Failure in ExpectRestoringWallpaperVisibility");
     EXPECT_LT(0u, test_animator_->GetAnimationCount());
     EXPECT_TRUE(test_animator_->AreContainersAnimated(
         SessionStateAnimator::WALLPAPER,
         SessionStateAnimator::ANIMATION_FADE_IN));
   }
 
   void ExpectUnlockedState() {
     SCOPED_TRACE("Failure in ExpectUnlockedState");
     EXPECT_EQ(0u, test_animator_->GetAnimationCount());
-    EXPECT_FALSE(WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked());
+    EXPECT_FALSE(WmShell::Get()->session_controller()->IsScreenLocked());
   }
 
   void ExpectLockedState() {
     SCOPED_TRACE("Failure in ExpectLockedState");
     EXPECT_EQ(0u, test_animator_->GetAnimationCount());
-    EXPECT_TRUE(WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked());
+    EXPECT_TRUE(WmShell::Get()->session_controller()->IsScreenLocked());
   }
 
   void HideWallpaper() { test_animator_->HideWallpaper(); }
 
   void PressPowerButton() {
     power_button_controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   }
 
   void ReleasePowerButton() {
     power_button_controller_->OnPowerButtonEvent(false, base::TimeTicks::Now());
@@ skipping 10 matching lines @@
   void PressVolumeDown() {
     GetEventGenerator().PressKey(ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
   }
 
   void ReleaseVolumeDown() {
     GetEventGenerator().ReleaseKey(ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
   }
 
   void SystemLocks() {
     lock_state_controller_->OnLockStateChanged(true);
-    WmShell::Get()->GetSessionStateDelegate()->LockScreen();
+    WmShell::Get()->session_controller()->LockScreenAndFlushForTest();
   }
 
   void SuccessfulAuthentication(bool* call_flag) {
     base::Closure closure = base::Bind(&CheckCalledCallback, call_flag);
     lock_state_controller_->OnLockScreenHide(closure);
   }
 
   void SystemUnlocks() {
     lock_state_controller_->OnLockStateChanged(false);
-    WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
+    GetSessionControllerClient()->UnlockScreen();
   }
 
   void EnableMaximizeMode(bool enable) {
     WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
         enable);
   }
 
   void Initialize(bool legacy_button, LoginStatus status) {
     power_button_controller_->set_has_legacy_power_button_for_test(
         legacy_button);
     lock_state_controller_->OnLoginStateChanged(status);
     SetUserLoggedIn(status != LoginStatus::NOT_LOGGED_IN);
     if (status == LoginStatus::GUEST)
-      TestSessionStateDelegate::SetCanLockScreen(false);
+      SetCanLockScreen(false);
     lock_state_controller_->OnLockStateChanged(false);
   }
 
   PowerButtonController* power_button_controller_;  // not owned
   LockStateController* lock_state_controller_;      // not owned
   TestShutdownController test_shutdown_controller_;
   // Ownership is passed on to chromeos::DBusThreadManager.
   chromeos::FakeSessionManagerClient* session_manager_client_;
   TestSessionStateAnimator* test_animator_;       // not owned
   std::unique_ptr<LockStateControllerTestApi> test_api_;
@@ skipping 722 matching lines @@
   ASSERT_EQ(0, delegate->handle_take_screenshot_count());
   PressVolumeDown();
   PressPowerButton();
   ReleasePowerButton();
   ReleaseVolumeDown();
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 }
 
 }  // namespace test
 }  // namespace ash