| Index: ash/wm/window_cycle_controller_unittest.cc
|
| ===================================================================
|
| --- ash/wm/window_cycle_controller_unittest.cc (revision 127786)
|
| +++ ash/wm/window_cycle_controller_unittest.cc (working copy)
|
| @@ -132,21 +132,15 @@
|
| EXPECT_FALSE(controller->IsCycling());
|
| EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
|
|
|
| - // When a screen lock window is visible, cycling window does not take effect.
|
| - aura::Window* lock_screen_container =
|
| - Shell::GetInstance()->GetContainer(
|
| - internal::kShellWindowId_LockScreenContainer);
|
| - scoped_ptr<Window> lock_screen_window(
|
| - CreateTestWindowWithId(-1, lock_screen_container));
|
| - lock_screen_window->Show();
|
| + // When the screen is locked, cycling window does not take effect.
|
| + Shell::GetInstance()->delegate()->LockScreen();
|
| EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
|
| controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
|
| EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
|
| controller->HandleCycleWindow(WindowCycleController::BACKWARD, false);
|
| EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
|
|
|
| - // Hiding the lock screen is equivalent to not being locked.
|
| - lock_screen_window->Hide();
|
| + Shell::GetInstance()->delegate()->UnlockScreen();
|
| EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
|
| controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
|
| EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
|
|
|