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

ash/wm/mru_window_tracker_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/mru_window_tracker.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #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 {
 
 class MruWindowTrackerTest : public test::AshTestBase {
  public:
   MruWindowTrackerTest() {}
   ~MruWindowTrackerTest() override {}
 
   std::unique_ptr<aura::Window> CreateTestWindow() {
@@ skipping 10 matching lines @@
 
 // Basic test that the activation order is tracked.
 TEST_F(MruWindowTrackerTest, Basic) {
   std::unique_ptr<aura::Window> w1(CreateTestWindow());
   std::unique_ptr<aura::Window> w2(CreateTestWindow());
   std::unique_ptr<aura::Window> w3(CreateTestWindow());
   wm::ActivateWindow(w3.get());
   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.
 TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) {
   std::unique_ptr<aura::Window> w1(CreateTestWindow());
   std::unique_ptr<aura::Window> w2(CreateTestWindow());
   std::unique_ptr<aura::Window> w3(CreateTestWindow());
   std::unique_ptr<aura::Window> w4(CreateTestWindow());
   std::unique_ptr<aura::Window> w5(CreateTestWindow());
   std::unique_ptr<aura::Window> w6(CreateTestWindow());
   wm::ActivateWindow(w6.get());
   wm::ActivateWindow(w5.get());
   wm::ActivateWindow(w4.get());
   wm::ActivateWindow(w3.get());
   wm::ActivateWindow(w2.get());
   wm::ActivateWindow(w1.get());
 
   wm::GetWindowState(w1.get())->Minimize();
   wm::GetWindowState(w4.get())->Minimize();
   wm::GetWindowState(w5.get())->Minimize();
 
   // By minimizing the first window, we activate w2 which will move it to the
   // 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.
 TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) {
   std::unique_ptr<aura::Window> w1(CreateTestWindow());
   wm::ActivateWindow(w1.get());
 
   // Start dragging the window.
   wm::GetWindowState(w1.get())->CreateDragDetails(
       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