mash: Migrate SessionStateDelegate access to WmShell.

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/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_lock_state_controller_delegate.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/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/size.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 #include "ui/display/types/display_constants.h"
 #endif
 
 namespace ash {
 namespace test {
 namespace {
 
 bool cursor_visible() {
-  return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible();
+  return Shell::GetInstance()->cursor_manager()->IsCursorVisible();
 }
 
 void CheckCalledCallback(bool* flag) {
   if (flag)
     (*flag) = true;
 }
 
 }  // namespace
 
 class LockStateControllerTest : public AshTestBase {
@@ skipping 13 matching lines @@
     test_animator_ = new TestSessionStateAnimator;
 
     lock_state_controller_ = Shell::GetInstance()->lock_state_controller();
     lock_state_controller_->SetDelegate(
         std::move(lock_state_controller_delegate));
     lock_state_controller_->set_animator_for_test(test_animator_);
 
     test_api_.reset(new LockStateController::TestApi(lock_state_controller_));
 
     power_button_controller_ = Shell::GetInstance()->power_button_controller();
-    session_state_delegate_ = Shell::GetInstance()->session_state_delegate();
 
-    shell_delegate_ = reinterpret_cast<TestShellDelegate*>(
-        ash::Shell::GetInstance()->delegate());
+    shell_delegate_ =
+        reinterpret_cast<TestShellDelegate*>(Shell::GetInstance()->delegate());

[James Cook, 2016/06/29 21:12:23]

optional: I wonder if static_cast<> would work here.

[msw, 2016/06/29 21:43:34]

Done.

   }
 
  protected:
   void GenerateMouseMoveEvent() {
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
     generator.MoveMouseTo(10, 10);
   }
 
   int NumShutdownRequests() {
     return lock_state_controller_delegate_->num_shutdown_requests() +
@@ skipping 159 matching lines @@
     SCOPED_TRACE("Failure in ExpectRestoringBackgroundVisibility");
     EXPECT_LT(0u, test_animator_->GetAnimationCount());
     EXPECT_TRUE(test_animator_->AreContainersAnimated(
         SessionStateAnimator::DESKTOP_BACKGROUND,
         SessionStateAnimator::ANIMATION_FADE_IN));
   }
 
   void ExpectUnlockedState() {
     SCOPED_TRACE("Failure in ExpectUnlockedState");
     EXPECT_EQ(0u, test_animator_->GetAnimationCount());
-    EXPECT_FALSE(session_state_delegate_->IsScreenLocked());
+    EXPECT_FALSE(WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked());
   }
 
   void ExpectLockedState() {
     SCOPED_TRACE("Failure in ExpectLockedState");
     EXPECT_EQ(0u, test_animator_->GetAnimationCount());
-    EXPECT_TRUE(session_state_delegate_->IsScreenLocked());
+    EXPECT_TRUE(WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked());
   }
 
   void HideBackground() { test_animator_->HideBackground(); }
 
   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);
-    session_state_delegate_->LockScreen();
+    WmShell::Get()->GetSessionStateDelegate()->LockScreen();
   }
 
   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);
-    session_state_delegate_->UnlockScreen();
+    WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
   }
 
   void EnableMaximizeMode(bool enable) {
     Shell::GetInstance()
         ->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)
       SetCanLockScreen(false);
     lock_state_controller_->OnLockStateChanged(false);
   }
 
   PowerButtonController* power_button_controller_;  // not owned
   LockStateController* lock_state_controller_;      // not owned
   TestLockStateControllerDelegate*
       lock_state_controller_delegate_;            // not owned
   TestSessionStateAnimator* test_animator_;       // not owned
-  SessionStateDelegate* session_state_delegate_;  // not owned
   std::unique_ptr<LockStateController::TestApi> test_api_;
   TestShellDelegate* shell_delegate_;  // not owned
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LockStateControllerTest);
 };
 
 // Test the lock-to-shutdown flow for non-Chrome-OS hardware that doesn't
 // correctly report power button releases.  We should lock immediately the first
 // time the button is pressed and shut down when it's pressed from the locked
@@ skipping 746 matching lines @@
   ReleasePowerButton();
 
   ExpectPreLockAnimationStarted();
 
   test_animator_->CompleteAllAnimations(true);
   EXPECT_EQ(1, lock_state_controller_delegate_->num_lock_requests());
 }
 
 }  // namespace test
 }  // namespace ash