Removes/promotes functions from WmWindowMus to WmWindowAura

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 7f750502ea53a744a0fc1c4b685d56cb2f3b82d0..24e2c620cc29cde6d10d4ae56a40724a97f298bc 100644
--- a/ash/mus/test/wm_test_base.h
+++ b/ash/mus/test/wm_test_base.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include "ash/mus/bridge/wm_window_mus_test_api.h"
+#include "ash/test/wm_window_aura_test_api.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
@@ -85,7 +85,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<WmWindowAuraTestApi::GlobalMinimumSizeLock>
+      minimum_size_lock_;
   std::unique_ptr<WmTestHelper> test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(WmTestBase);