chromeos: Makes AshTestBase/Helper target mash when appropriate

ash/test/ash_test_helper.h

Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 448beff5414e37eafb1358abc16e7543636e884b..64e16eb3a7b248919e70b4d2c8c66e17c4620d34 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -5,15 +5,24 @@
 #ifndef ASH_TEST_ASH_TEST_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
+#include <stdint.h>
+
 #include <memory>
+#include <vector>
 
 #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 {
+class Display;
+}
+
 namespace ui {
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
@@ -23,6 +32,13 @@ class WMState;
 }
 
 namespace ash {
+
+class RootWindowController;
+
+namespace mus {
+class WindowManagerApplication;
+}
+
 namespace test {
 
 class AshTestEnvironment;
@@ -65,7 +81,31 @@ class AshTestHelper {
 
   AshTestEnvironment* ash_test_environment() { return ash_test_environment_; }
 
+  // Version of DisplayManagerTestApi::UpdateDisplay() for mash.
+  void UpdateDisplayForMash(const std::string& display_spec);
+
+  display::Display GetSecondaryDisplay();
+
  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(
+      const std::string& display_spec,
+      int* next_x);
+
+  // Updates an existing display based on |display_spec|.
+  void UpdateDisplay(RootWindowController* root_window_controller,
+                     const std::string& display_spec,
+                     int* next_x);
+
+  std::vector<RootWindowController*> GetRootsOrderedByDisplayId();
+
   AshTestEnvironment* ash_test_environment_;  // Not owned.
   TestShellDelegate* test_shell_delegate_;  // Owned by ash::Shell.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
@@ -81,6 +121,12 @@ class AshTestHelper {
   // 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;
+
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };