Removes/promotes functions from WmWindowMus to WmWindowAura

ash/mus/test/wm_test_base.cc

 // 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.
 
 #include "ash/mus/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "ash/mus/bridge/wm_window_mus_test_api.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/test/wm_test_helper.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
+#include "ash/test/wm_window_aura_test_api.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
 
 namespace ash {
 namespace mus {
@@ skipping 130 matching lines @@
   return window;
 }
 
 void WmTestBase::SetUp() {
   setup_called_ = true;
   // Disable animations during tests.
   zero_duration_mode_ = base::MakeUnique<ui::ScopedAnimationDurationScaleMode>(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   // Most tests expect a minimum size of 0x0.
   minimum_size_lock_ =
-      base::MakeUnique<WmWindowMusTestApi::GlobalMinimumSizeLock>();
+      base::MakeUnique<WmWindowAuraTestApi::GlobalMinimumSizeLock>();
   test_helper_.reset(new WmTestHelper);
   test_helper_->Init();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
   minimum_size_lock_.reset();
   zero_duration_mode_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash