chromeos: Renames WmWindowAura to WmWindow

ash/mus/root_window_controller.cc

Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index 599f77265d7e0d0ac95e51ca7e11dddd2495c7fa..e14a347e36d1c128aa01cfbec30a0a045a1dc8a2 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -13,13 +13,13 @@
 #include <utility>
 #include <vector>
 
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
+#include "ash/common/wm_window.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
@@ -161,23 +161,21 @@ aura::Window* RootWindowController::NewTopLevelWindow(
   if (container_window) {
     container_window->AddChild(window);
   } else {
-    WmWindowAura* root = WmWindowAura::Get(this->root());
+    WmWindow* root = WmWindow::Get(this->root());
     gfx::Point origin =
         root->ConvertPointToTarget(root->GetRootWindow(), gfx::Point());
     origin += display_.bounds().OffsetFromOrigin();
     gfx::Rect bounds_in_screen(origin, bounds.size());
-    static_cast<WmWindowAura*>(
-        ash::wm::GetDefaultParent(WmWindowAura::Get(context),
-                                  WmWindowAura::Get(window), bounds_in_screen))
+    ash::wm::GetDefaultParent(WmWindow::Get(context), WmWindow::Get(window),
+                              bounds_in_screen)
         ->aura_window()
         ->AddChild(window);
   }
   return window;
 }
 
-ash::WmWindowAura* RootWindowController::GetWindowByShellWindowId(int id) {
-  return static_cast<WmWindowAura*>(
-      WmWindowAura::Get(root())->GetChildByShellWindowId(id));
+WmWindow* RootWindowController::GetWindowByShellWindowId(int id) {
+  return WmWindow::Get(root())->GetChildByShellWindowId(id);
 }
 
 void RootWindowController::SetWorkAreaInests(const gfx::Insets& insets) {