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

ash/wm/mru_window_tracker_unittest.cc

Index: ash/wm/mru_window_tracker_unittest.cc
diff --git a/ash/wm/mru_window_tracker_unittest.cc b/ash/wm/mru_window_tracker_unittest.cc
index 7069a36310c74e6fa0d32bb7bbc4bf7658cd93ce..3d6f30504382c244ebcc422f7e2d6fa57f24f50a 100644
--- a/ash/wm/mru_window_tracker_unittest.cc
+++ b/ash/wm/mru_window_tracker_unittest.cc
@@ -9,7 +9,6 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
@@ -40,11 +39,12 @@ TEST_F(MruWindowTrackerTest, Basic) {
   wm::ActivateWindow(w2.get());
   wm::ActivateWindow(w1.get());
 
-  WmWindow::Windows window_list = mru_window_tracker()->BuildMruWindowList();
+  MruWindowTracker::WindowList window_list =
+      mru_window_tracker()->BuildMruWindowList();
   ASSERT_EQ(3u, window_list.size());
-  EXPECT_EQ(w1.get(), window_list[0]->aura_window());
-  EXPECT_EQ(w2.get(), window_list[1]->aura_window());
-  EXPECT_EQ(w3.get(), window_list[2]->aura_window());
+  EXPECT_EQ(w1.get(), window_list[0]);
+  EXPECT_EQ(w2.get(), window_list[1]);
+  EXPECT_EQ(w3.get(), window_list[2]);
 }
 
 // Test that minimized windows are not treated specially.
@@ -70,13 +70,14 @@ TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) {
   // front of the MRU queue.
   EXPECT_TRUE(wm::IsActiveWindow(w2.get()));
 
-  WmWindow::Windows window_list = mru_window_tracker()->BuildMruWindowList();
-  EXPECT_EQ(w2.get(), window_list[0]->aura_window());
-  EXPECT_EQ(w1.get(), window_list[1]->aura_window());
-  EXPECT_EQ(w3.get(), window_list[2]->aura_window());
-  EXPECT_EQ(w4.get(), window_list[3]->aura_window());
-  EXPECT_EQ(w5.get(), window_list[4]->aura_window());
-  EXPECT_EQ(w6.get(), window_list[5]->aura_window());
+  MruWindowTracker::WindowList window_list =
+      mru_window_tracker()->BuildMruWindowList();
+  EXPECT_EQ(w2.get(), window_list[0]);
+  EXPECT_EQ(w1.get(), window_list[1]);
+  EXPECT_EQ(w3.get(), window_list[2]);
+  EXPECT_EQ(w4.get(), window_list[3]);
+  EXPECT_EQ(w5.get(), window_list[4]);
+  EXPECT_EQ(w6.get(), window_list[5]);
 }
 
 // Tests that windows being dragged are only in the WindowList once.
@@ -89,10 +90,9 @@ TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) {
       gfx::Point(), HTRIGHT, aura::client::WINDOW_MOVE_SOURCE_TOUCH);
 
   // The dragged window should only be in the list once.
-  WmWindow::Windows window_list =
+  MruWindowTracker::WindowList window_list =
       mru_window_tracker()->BuildWindowListIgnoreModal();
-  EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(),
-                          WmWindow::Get(w1.get())));
+  EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1.get()));
 }
 
 }  // namespace ash