Removes/promotes functions from WmWindowMus to WmWindowAura

ash/mus/test/wm_test_base.h

 // Copyright 2016 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_TEST_WM_TEST_BASE_H_
 #define ASH_MUS_TEST_WM_TEST_BASE_H_
 
 #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"
 #include "ui/wm/public/window_types.h"
 
 namespace aura {
 class Window;
 }
 
 namespace display {
@@ skipping 56 matching lines @@
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  private:
   friend class AshTestImplMus;
 
   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);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_TEST_WM_TEST_BASE_H_