ash: Use SessionController instead of SessionStateDelegate

ash/accelerators/accelerator_filter_unittest.cc

Index: ash/accelerators/accelerator_filter_unittest.cc
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
index bfa1c34ed2fb01da582df4df017e3a19d17e592f..29d0dd2747023b50dfbd47c7bdcc0b3cf5775b26 100644
--- a/ash/accelerators/accelerator_filter_unittest.cc
+++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -8,7 +8,7 @@
 
 #include "ash/accelerators/accelerator_delegate.h"
 #include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ -149,27 +149,29 @@ TEST_F(AcceleratorFilterTest, CanConsumeSystemKeys) {
 }
 
 TEST_F(AcceleratorFilterTest, SearchKeyShortcutsAreAlwaysHandled) {
-  TestSessionStateDelegate* session_state_delegate =
-      AshTestHelper::GetTestSessionStateDelegate();
-  EXPECT_FALSE(session_state_delegate->IsScreenLocked());
+  SessionController* const session_controller =
+      WmShell::Get()->session_controller();
+  EXPECT_FALSE(session_controller->IsScreenLocked());
 
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   // We can lock the screen (Search+L) if a window is not present.
   generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
   generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
-  EXPECT_TRUE(session_state_delegate->IsScreenLocked());
+  RunAllPendingInMessageLoop();  // LockScreen is an async mojo call.

[James Cook, 2017/03/17 17:14:35]

What do you think of adding SessionController::FlushForTesting() or
FlushMojoForTesting() or MojoFlushForTesting() that calls FlushForTesting() on
the mojo bindingset?

Then this would be:
session_controller->FlushMojoForTesting();  // For LockScreen.

which might be more self-documenting.

Update: Or you could just use LockScreenAndFlushForTesting() :-)

[xiyuan, 2017/03/17 22:52:02]

Done. Added a SessionController::FlushMojoForTest and use that. 

I could not use LockScreenAndFlushForTesting() here because the actual LockScree
call is in accelerator handler production code.

+  EXPECT_TRUE(session_controller->IsScreenLocked());
   UnblockUserSession();
-  EXPECT_FALSE(session_state_delegate->IsScreenLocked());
+  EXPECT_FALSE(session_controller->IsScreenLocked());
 
   // Search+L is processed when the app_list target visibility is false.
   Shell::Get()->DismissAppList();
   EXPECT_FALSE(Shell::Get()->GetAppListTargetVisibility());
   generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
   generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
-  EXPECT_TRUE(session_state_delegate->IsScreenLocked());
+  RunAllPendingInMessageLoop();  // LockScreen is an async mojo call.
+  EXPECT_TRUE(session_controller->IsScreenLocked());
   UnblockUserSession();
-  EXPECT_FALSE(session_state_delegate->IsScreenLocked());
+  EXPECT_FALSE(session_controller->IsScreenLocked());
 
   // Search+L is also processed when there is a full screen window.
   aura::test::TestWindowDelegate window_delegate;
@@ -178,9 +180,10 @@ TEST_F(AcceleratorFilterTest, SearchKeyShortcutsAreAlwaysHandled) {
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
   generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
-  EXPECT_TRUE(session_state_delegate->IsScreenLocked());
+  RunAllPendingInMessageLoop();  // LockScreen is an async mojo call.
+  EXPECT_TRUE(session_controller->IsScreenLocked());
   UnblockUserSession();
-  EXPECT_FALSE(session_state_delegate->IsScreenLocked());
+  EXPECT_FALSE(session_controller->IsScreenLocked());
 }
 
 }  // namespace test