chromeos: Renames WmWindowAura to WmWindow

ash/mus/test/ash_test_impl_mus.cc

Index: ash/mus/test/ash_test_impl_mus.cc
diff --git a/ash/mus/test/ash_test_impl_mus.cc b/ash/mus/test/ash_test_impl_mus.cc
index 5ef0e305f153c7355fc28cadd632c2f4922f1d27..e4e91867134c00951b4bfd8d2bc3143f0339dc00 100644
--- a/ash/mus/test/ash_test_impl_mus.cc
+++ b/ash/mus/test/ash_test_impl_mus.cc
@@ -4,8 +4,8 @@
 
 #include "ash/mus/test/ash_test_impl_mus.h"
 
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/test/ash_test.h"
+#include "ash/common/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
@@ -58,8 +58,8 @@ std::unique_ptr<WindowOwner> AshTestImplMus::CreateTestWindow(
     const gfx::Rect& bounds_in_screen,
     ui::wm::WindowType type,
     int shell_window_id) {
-  ash::WmWindowAura* window = ash::WmWindowAura::Get(
-      wm_test_base_->CreateTestWindow(bounds_in_screen, type));
+  WmWindow* window =
+      WmWindow::Get(wm_test_base_->CreateTestWindow(bounds_in_screen, type));
   window->SetShellWindowId(shell_window_id);
   return base::MakeUnique<WindowOwner>(window);
 }
@@ -87,7 +87,7 @@ bool AshTestImplMus::SetSecondaryDisplayPlacement(
 void AshTestImplMus::ConfigureWidgetInitParamsForDisplay(
     WmWindow* window,
     views::Widget::InitParams* init_params) {
-  init_params->context = WmWindowAura::GetAuraWindow(window);
+  init_params->context = WmWindow::GetAuraWindow(window);
   init_params
       ->mus_properties[ui::mojom::WindowManager::kDisplayId_InitProperty] =
       mojo::ConvertTo<std::vector<uint8_t>>(
@@ -96,8 +96,8 @@ void AshTestImplMus::ConfigureWidgetInitParamsForDisplay(
 
 void AshTestImplMus::AddTransientChild(WmWindow* parent, WmWindow* window) {
   // TODO(sky): remove this as both classes can share same implementation now.
-  ::wm::AddTransientChild(WmWindowAura::GetAuraWindow(parent),
-                          WmWindowAura::GetAuraWindow(window));
+  ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent),
+                          WmWindow::GetAuraWindow(window));
 }
 
 }  // namespace mus