Converts ash to use aura-mus

ash/mus/test/wm_test_base.h

Index: ash/mus/test/wm_test_base.h
diff --git a/ash/mus/test/wm_test_base.h b/ash/mus/test/wm_test_base.h
index f1459f7e1097848ce3ec140360dd7d3b33b54da4..7f750502ea53a744a0fc1c4b685d56cb2f3b82d0 100644
--- a/ash/mus/test/wm_test_base.h
+++ b/ash/mus/test/wm_test_base.h
@@ -8,11 +8,16 @@
 #include <memory>
 #include <string>
 
+#include "ash/mus/bridge/wm_window_mus_test_api.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
 #include "ui/wm/public/window_types.h"
 
+namespace aura {
+class Window;
+}
+
 namespace display {
 class Display;
 }
@@ -22,7 +27,7 @@ class Rect;
 }
 
 namespace ui {
-class Window;
+class ScopedAnimationDurationScaleMode;
 }
 
 namespace ash {
@@ -33,6 +38,7 @@ class WmTestHelper;
 
 // Base class for window manager tests that want to configure
 // WindowTreeClient without a client to mus.
+// TODO(sky): nuke this.
 class WmTestBase : public testing::Test {
  public:
   WmTestBase();
@@ -45,8 +51,8 @@ class WmTestBase : public testing::Test {
   // See test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_spec);
 
-  ui::Window* GetPrimaryRootWindow();
-  ui::Window* GetSecondaryRootWindow();
+  aura::Window* GetPrimaryRootWindow();
+  aura::Window* GetSecondaryRootWindow();
 
   display::Display GetPrimaryDisplay();
   display::Display GetSecondaryDisplay();
@@ -55,18 +61,18 @@ class WmTestBase : public testing::Test {
   // NOTE: you can explicitly destroy the returned value if necessary, but it
   // will also be automatically destroyed when the WindowTreeClient is
   // destroyed.
-  ui::Window* CreateTestWindow(const gfx::Rect& bounds);
-  ui::Window* CreateTestWindow(const gfx::Rect& bounds,
-                               ui::wm::WindowType window_type);
+  aura::Window* CreateTestWindow(const gfx::Rect& bounds);
+  aura::Window* CreateTestWindow(const gfx::Rect& bounds,
+                                 ui::wm::WindowType window_type);
 
   // Creates a visibile fullscreen top level window on the display corresponding
   // to the display_id provided.
-  ui::Window* CreateFullscreenTestWindow(
+  aura::Window* CreateFullscreenTestWindow(
       int64_t display_id = display::kInvalidDisplayId);
 
   // Creates a window parented to |parent|. The returned window is visible.
-  ui::Window* CreateChildTestWindow(ui::Window* parent,
-                                    const gfx::Rect& bounds);
+  aura::Window* CreateChildTestWindow(aura::Window* parent,
+                                      const gfx::Rect& bounds);
 
  protected:
   // testing::Test:
@@ -78,6 +84,8 @@ class WmTestBase : public testing::Test {
 
   bool setup_called_ = false;
   bool teardown_called_ = false;
+  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
+  std::unique_ptr<WmWindowMusTestApi::GlobalMinimumSizeLock> minimum_size_lock_;
   std::unique_ptr<WmTestHelper> test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(WmTestBase);