chromeos: Renames WmWindowAura to WmWindow

ash/shell/window_watcher.cc

Index: ash/shell/window_watcher.cc
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index 99ed48b473ea45734e65c5b8c7207b7ad894a1d6..167e6ebef8416062774bb147570028f5d2e6c019 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -6,10 +6,10 @@
 
 #include <utility>
 
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ -117,7 +117,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
   std::unique_ptr<ShelfItemDelegate> delegate(
       new WindowWatcherShelfItemDelegate(id, this));
   model->SetShelfItemDelegate(id, std::move(delegate));
-  WmWindowAura::Get(new_window)->SetIntProperty(WmWindowProperty::SHELF_ID, id);
+  WmWindow::Get(new_window)->SetIntProperty(WmWindowProperty::SHELF_ID, id);
 }
 
 void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {