chromeos: Makes AshTestBase/Helper target mash when appropriate

ash/mus/window_manager.h

 // Copyright 2015 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_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 27 matching lines @@
 namespace wm {
 class WMState;
 }
 
 namespace ash {
 
 class RootWindowController;
 class ScreenMus;
 class ShellDelegate;
 
+namespace test {
+class AshTestHelper;
+}
+
 namespace mus {
 
 class AcceleratorHandler;
 class WmLookupMus;
 class WmTestHelper;
 
 // WindowManager serves as the WindowManagerDelegate and
 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
 // a RootWindowController per Display. WindowManager takes ownership of
 // the WindowTreeClient.
@@ skipping 37 matching lines @@
   // Returns the DisplayController interface if available. Will be null if no
   // service_manager::Connector was available, for example in some tests.
   display::mojom::DisplayController* GetDisplayController();
 
   // Called during creation of the shell to create a RootWindowController.
   // See comment in CreateRootWindowController() for details.
   void CreatePrimaryRootWindowController(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
 
  private:
+  friend class ash::test::AshTestHelper;
   friend class WmTestHelper;
 
   using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>;
 
   // Called once the first Display has been obtained.
   void CreateShell(
       std::unique_ptr<aura::WindowTreeHostMus> primary_window_tree_host);
 
   void CreateAndRegisterRootWindowController(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
@@ skipping 72 matching lines @@
   std::unique_ptr<WmLookupMus> lookup_;
 
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   // Only set in tests. If non-null this is used as the shell delegate.
   std::unique_ptr<ShellDelegate> shell_delegate_for_test_;
 
+  // See WmShellMus's constructor for details. Tests may set to false.
+  bool create_session_state_delegate_stub_for_test_ = true;
+
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_