Index: trunk/src/ash/shell_unittest.cc |
=================================================================== |
--- trunk/src/ash/shell_unittest.cc (revision 194588) |
+++ trunk/src/ash/shell_unittest.cc (working copy) |
@@ -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 @@ |
EXPECT_TRUE(GetDefaultContainer()->Contains( |
widget->GetNativeWindow()->parent())); |
- Shell::GetInstance()->session_state_delegate()->LockScreen(); |
+ Shell::GetInstance()->delegate()->LockScreen(); |
// Create a LockScreen window. |
views::Widget* lock_widget = CreateTestWindow(widget_params); |
ash::Shell::GetContainer( |
@@ -264,12 +264,10 @@ |
} |
TEST_F(ShellTest, IsScreenLocked) { |
- SessionStateDelegate* delegate = |
- Shell::GetInstance()->session_state_delegate(); |
- delegate->LockScreen(); |
- EXPECT_TRUE(delegate->IsScreenLocked()); |
- delegate->UnlockScreen(); |
- EXPECT_FALSE(delegate->IsScreenLocked()); |
+ ash::Shell::GetInstance()->delegate()->LockScreen(); |
+ EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked()); |
+ ash::Shell::GetInstance()->delegate()->UnlockScreen(); |
+ EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked()); |
} |
// Fails on Mac, see http://crbug.com/115662 |