Converts ash to use aura-mus

ash/mus/test/ash_test_impl_mus.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/ash_test_impl_mus.h"
 
 #include "ash/common/test/ash_test.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
+#include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 // WmTestBase is abstract as TestBody() is pure virtual (the various TEST
 // macros have the implementation). In order to create WmTestBase we have to
 // subclass with an empty implementation of TestBody(). That's ok as the class
 // isn't used as a normal test here.
 class WmTestBaseImpl : public WmTestBase {
@@ skipping 57 matching lines @@
 bool AshTestImplMus::SetSecondaryDisplayPlacement(
     display::DisplayPlacement::Position position,
     int offset) {
   NOTIMPLEMENTED();
   return false;
 }
 
 void AshTestImplMus::ConfigureWidgetInitParamsForDisplay(
     WmWindow* window,
     views::Widget::InitParams* init_params) {
+  init_params->context = WmWindowMus::GetAuraWindow(window);
   init_params
       ->mus_properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
-          WmWindowMus::GetMusWindow(window)->display_id());
+          window->GetDisplayNearestWindow().id());
 }
 
 void AshTestImplMus::AddTransientChild(WmWindow* parent, WmWindow* window) {
-  WmWindowMus::GetMusWindow(parent)->AddTransientWindow(
-      WmWindowMus::GetMusWindow(window));
+  // TODO(sky): remove this as both classes can share same implementation now.
+  ::wm::AddTransientChild(WmWindowAura::GetAuraWindow(parent),
+                          WmWindowAura::GetAuraWindow(window));
 }
 
 }  // namespace mus
 
 // static
 std::unique_ptr<AshTestImpl> AshTestImpl::Create() {
   return base::MakeUnique<mus::AshTestImplMus>();
 }
 
 }  // namespace ash