[mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode

ash/wm/ash_focus_rules.cc

Index: ash/wm/ash_focus_rules.cc
diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
index 0930d707b34c3fc95013b7e16875a30c60e5ee97..28d354e2a30d562128ed1a7f79513aab5bdfa6af 100644
--- a/ash/wm/ash_focus_rules.cc
+++ b/ash/wm/ash_focus_rules.cc
@@ -11,7 +11,6 @@
 #include "ash/wm/focus_rules.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
@@ -42,7 +41,7 @@ AshFocusRules::~AshFocusRules() = default;
 // AshFocusRules, ::wm::FocusRules:
 
 bool AshFocusRules::IsToplevelWindow(aura::Window* window) const {
-  return ash::IsToplevelWindow(WmWindow::Get(window));
+  return ash::IsToplevelWindow(window);
 }
 
 bool AshFocusRules::SupportsChildActivation(aura::Window* window) const {
@@ -51,7 +50,7 @@ bool AshFocusRules::SupportsChildActivation(aura::Window* window) const {
 
 bool AshFocusRules::IsWindowConsideredVisibleForActivation(
     aura::Window* window) const {
-  return ash::IsWindowConsideredVisibleForActivation(WmWindow::Get(window));
+  return ash::IsWindowConsideredVisibleForActivation(window);
 }
 
 bool AshFocusRules::CanActivateWindow(aura::Window* window) const {
@@ -91,9 +90,8 @@ aura::Window* AshFocusRules::GetNextActivatableWindow(
   // MRU windows is empty, then start from the container of the window that just
   // lost focus |ignore|.
   MruWindowTracker* mru = Shell::Get()->mru_window_tracker();
-  std::vector<WmWindow*> windows = mru->BuildMruWindowList();
-  aura::Window* starting_window =
-      windows.empty() ? ignore : WmWindow::GetAuraWindow(windows[0]);
+  aura::Window::Windows windows = mru->BuildMruWindowList();
+  aura::Window* starting_window = windows.empty() ? ignore : windows[0];
 
   // Look for windows to focus in |starting_window|'s container. If none are
   // found, we look in all the containers in front of |starting_window|'s