diff options
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 039354f..70ca5c2 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -11,9 +11,9 @@ #include "ash/desktop_background/desktop_background_widget_controller.h" #include "ash/launcher/launcher.h" #include "ash/root_window_controller.h" +#include "ash/session_state_delegate.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" -#include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ash/wm/root_window_layout_manager.h" @@ -219,7 +219,7 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { EXPECT_TRUE(GetDefaultContainer()->Contains( widget->GetNativeWindow()->parent())); - Shell::GetInstance()->delegate()->LockScreen(); + Shell::GetInstance()->session_state_delegate()->LockScreen(); // Create a LockScreen window. views::Widget* lock_widget = CreateTestWindow(widget_params); ash::Shell::GetContainer( @@ -264,10 +264,12 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) { } TEST_F(ShellTest, IsScreenLocked) { - ash::Shell::GetInstance()->delegate()->LockScreen(); - EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked()); - ash::Shell::GetInstance()->delegate()->UnlockScreen(); - EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked()); + SessionStateDelegate* delegate = + Shell::GetInstance()->session_state_delegate(); + delegate->LockScreen(); + EXPECT_TRUE(delegate->IsScreenLocked()); + delegate->UnlockScreen(); + EXPECT_FALSE(delegate->IsScreenLocked()); } // Fails on Mac, see http://crbug.com/115662 |