ash: Use SessionController instead of SessionStateDelegate

ash/test/ash_test_helper.h

 // Copyright 2013 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.
 
 #ifndef ASH_TEST_ASH_TEST_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include <stdint.h>
 
 #include <memory>
+#include <utility>
 #include <vector>
 
+#include "ash/common/test/test_session_controller_client.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/test/mus/test_window_tree_client_setup.h"
 
 namespace aura {
 class Window;
 class WindowTreeClientPrivate;
 }  // namespace aura
 
 namespace display {
@@ skipping 15 matching lines @@
 namespace mus {
 class WindowManagerApplication;
 }
 
 namespace test {
 
 class AshTestEnvironment;
 class AshTestViewsDelegate;
 class TestScreenshotDelegate;
 class TestShellDelegate;
+class TestSessionControllerClient;
 class TestSessionStateDelegate;
 
 // A helper class that does common initialization required for Ash. Creates a
 // root window and an ash::Shell instance with a test delegate.
 class AshTestHelper {
  public:
   explicit AshTestHelper(AshTestEnvironment* ash_test_environment);
   ~AshTestHelper();
 
   // Creates the ash::Shell and performs associated initialization.  Set
@@ skipping 26 matching lines @@
   // Version of DisplayManagerTestApi::UpdateDisplay() for mash.
   void UpdateDisplayForMash(const std::string& display_spec);
 
   display::Display GetSecondaryDisplay();
 
   // Null in classic ash.
   mus::WindowManagerApplication* window_manager_app() {
     return window_manager_app_.get();
   }
 
+  TestSessionControllerClient* test_session_controller_client() {
+    return session_controller_client_.get();
+  }
+  void set_test_session_controller_client(
+      std::unique_ptr<TestSessionControllerClient> session_controller_client) {
+    session_controller_client_ = std::move(session_controller_client);
+  }
+
  private:
   // Called when running in mash to create the WindowManager.
   void CreateMashWindowManager();
 
   // Called when running in ash to create Shell.
   void CreateShell();
 
   // Creates a new RootWindowController based on |display_spec|. The origin is
   // set to |next_x| and on exit |next_x| is set to the origin + the width.
   RootWindowController* CreateRootWindowController(
@@ skipping 21 matching lines @@
   bool dbus_thread_manager_initialized_;
   // Check if Bluez DBus Manager was initialized here.
   bool bluez_dbus_manager_initialized_;
 
   aura::TestWindowTreeClientSetup window_tree_client_setup_;
   std::unique_ptr<mus::WindowManagerApplication> window_manager_app_;
   std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_;
   // Id for the next Display created by CreateRootWindowController().
   int64_t next_display_id_ = 1;
 
+  std::unique_ptr<TestSessionControllerClient> session_controller_client_;
+
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_