ash: Use SessionController instead of SessionStateDelegate

ash/system/chromeos/power/tablet_power_button_controller_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/power/tablet_power_button_controller.h"
 
 #include <memory>
 
 #include "ash/common/ash_switches.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
+#include "ash/common/test/test_session_controller_client.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/lock_state_controller_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/power_button_controller.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 65 matching lines @@
   void PressPowerButton() {
     tablet_controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
   }
 
   void ReleasePowerButton() {
     tablet_controller_->OnPowerButtonEvent(false, base::TimeTicks::Now());
   }
 
   void UnlockScreen() {
     lock_state_controller_->OnLockStateChanged(false);
-    WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
+    GetSessionControllerClient()->UnlockScreen();
   }
 
   void Initialize(LoginStatus status) {
     lock_state_controller_->OnLoginStateChanged(status);
     SetUserLoggedIn(status != LoginStatus::NOT_LOGGED_IN);
     lock_state_controller_->OnLockStateChanged(false);
   }
 
   void EnableMaximizeMode(bool enabled) {
     WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
         enabled);
   }
 
   bool GetLockedState() {
-    return WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked();
+    // LockScreen is an async mojo call. Spin message loop to ensure it is
+    // delivered.
+    SessionController* const session_controller =
+        WmShell::Get()->session_controller();
+    session_controller->FlushMojoForTest();
+    return session_controller->IsScreenLocked();
   }
 
   bool GetBacklightsForcedOff() WARN_UNUSED_RESULT {
     bool forced_off = false;
     power_manager_client_->GetBacklightsForcedOff(
         base::Bind(&CopyResult, base::Unretained(&forced_off)));
     base::RunLoop().RunUntilIdle();
     return forced_off;
   }
 
@@ skipping 350 matching lines @@
   // Test that after another long duration, backlights should be forced off.
   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(800));
   power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_TRUE(GetBacklightsForcedOff());
 }
 
 }  // namespace test
 }  // namespace ash