| Index: ash/system/chromeos/power/power_event_observer_unittest.cc
|
| diff --git a/ash/system/chromeos/power/power_event_observer_unittest.cc b/ash/system/chromeos/power/power_event_observer_unittest.cc
|
| index 5d0b79f7a279d3e6a44a3da242772eb36c64a08c..d66204b03199b37a022bcda941dd4115c2d07d74 100644
|
| --- a/ash/system/chromeos/power/power_event_observer_unittest.cc
|
| +++ b/ash/system/chromeos/power/power_event_observer_unittest.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include <memory>
|
|
|
| -#include "ash/common/test/test_session_state_delegate.h"
|
| #include "ash/shell.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "base/time/time.h"
|
| @@ -58,7 +57,7 @@ TEST_F(PowerEventObserverTest, LockBeforeSuspend) {
|
|
|
| // Check that the observer requests a suspend-readiness callback when it hears
|
| // that the system is about to suspend.
|
| - test::TestSessionStateDelegate::SetCanLockScreen(true);
|
| + SetCanLockScreen(true);
|
| SetShouldLockScreenAutomatically(true);
|
| observer_->SuspendImminent();
|
| EXPECT_EQ(1, client->GetNumPendingSuspendReadinessCallbacks());
|
| @@ -96,7 +95,7 @@ TEST_F(PowerEventObserverTest, SetInvisibleBeforeSuspend) {
|
|
|
| // Tests that all the Compositors are marked invisible _after_ the screen lock
|
| // animations have completed.
|
| - test::TestSessionStateDelegate::SetCanLockScreen(true);
|
| + SetCanLockScreen(true);
|
| SetShouldLockScreenAutomatically(true);
|
|
|
| observer_->SuspendImminent();
|
| @@ -115,7 +114,7 @@ TEST_F(PowerEventObserverTest, SetInvisibleBeforeSuspend) {
|
| TEST_F(PowerEventObserverTest, CanceledSuspend) {
|
| // Tests that the Compositors are not marked invisible if a suspend is
|
| // canceled or the system resumes before the lock screen is ready.
|
| - test::TestSessionStateDelegate::SetCanLockScreen(true);
|
| + SetCanLockScreen(true);
|
| SetShouldLockScreenAutomatically(true);
|
| observer_->SuspendImminent();
|
| EXPECT_EQ(1, GetNumVisibleCompositors());
|
| @@ -137,7 +136,7 @@ TEST_F(PowerEventObserverTest, DelayResuspendForLockAnimations) {
|
| //
|
| // In this case, the observer should block the second suspend request until
|
| // the animations have completed.
|
| - test::TestSessionStateDelegate::SetCanLockScreen(true);
|
| + SetCanLockScreen(true);
|
| SetShouldLockScreenAutomatically(true);
|
|
|
| chromeos::PowerManagerClient* client =
|
|
|