[mus+ash] removes WmWindow, wm_window.h and wm_window.cc

ash/mus/bridge/shell_port_mash.cc

Index: ash/mus/bridge/shell_port_mash.cc
diff --git a/ash/mus/bridge/shell_port_mash.cc b/ash/mus/bridge/shell_port_mash.cc
index 40cc6d9d2fd776a430c22cfc14592c7198a6301c..46c4bc9f4474e2c4fed949add5f8dba31662f4cc 100644
--- a/ash/mus/bridge/shell_port_mash.cc
+++ b/ash/mus/bridge/shell_port_mash.cc
@@ -51,7 +51,6 @@
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "ash/wm_display_observer.h"
-#include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
@@ -271,19 +270,14 @@ bool ShellPortMash::IsMouseEventsEnabled() {
   return true;
 }
 
-std::vector<WmWindow*> ShellPortMash::GetAllRootWindows() {
-  if (GetAshConfig() == Config::MUS) {
-    aura::Window::Windows root_windows =
-        Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
-    std::vector<WmWindow*> wm_windows(root_windows.size());
-    for (size_t i = 0; i < root_windows.size(); ++i)
-      wm_windows[i] = WmWindow::Get(root_windows[i]);
-    return wm_windows;
-  }
-  std::vector<WmWindow*> root_windows;
+std::vector<aura::Window*> ShellPortMash::GetAllRootWindows() {
+  if (GetAshConfig() == Config::MUS)
+    return Shell::Get()->window_tree_host_manager()->GetAllRootWindows();
+
+  aura::Window::Windows root_windows;
   for (RootWindowController* root_window_controller :
        RootWindowController::root_window_controllers()) {
-    root_windows.push_back(root_window_controller->GetWindow());
+    root_windows.push_back(root_window_controller->GetRootWindow());
   }
   return root_windows;
 }