Converts MruWindowTracker to work with common types

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 0cca92d9ebd569c57525bdb82839e865a71b9f40..35a025deddc783deb3e4143fe389deb1e8ad0765 100644
--- a/ash/wm/mru_window_tracker_unittest.cc
+++ b/ash/wm/mru_window_tracker_unittest.cc
@@ -2,12 +2,14 @@
 // 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"

[James Cook, 2016/06/07 01:21:05]

Thanks for moving this up. It's one of my pet peeves in test code.

+
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shelf_delegate.h"

[James Cook, 2016/06/07 01:21:05]

While you're here, I don't think this is needed.

[sky, 2016/06/07 02:46:21]

Done.

-#include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"

[James Cook, 2016/06/07 01:21:05]

or this

[sky, 2016/06/07 02:46:21]

Done.

@@ -44,8 +46,8 @@ TEST_F(MruWindowTrackerTest, Basic) {
   wm::ActivateWindow(w2.get());
   wm::ActivateWindow(w1.get());
 
-  MruWindowTracker::WindowList window_list =
-      mru_window_tracker()->BuildMruWindowList();
+  aura::Window::Windows window_list =
+      WmWindowAura::ToAuraWindows(mru_window_tracker()->BuildMruWindowList());
   EXPECT_EQ(w1.get(), window_list[0]);
   EXPECT_EQ(w2.get(), window_list[1]);
   EXPECT_EQ(w3.get(), window_list[2]);
@@ -73,8 +75,8 @@ TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) {
 
   // Expect the relative order of minimized windows to remain the same, but all
   // minimized windows to be at the end of the list.
-  MruWindowTracker::WindowList window_list =
-      mru_window_tracker()->BuildMruWindowList();
+  aura::Window::Windows window_list =
+      WmWindowAura::ToAuraWindows(mru_window_tracker()->BuildMruWindowList());
   EXPECT_EQ(w2.get(), window_list[0]);
   EXPECT_EQ(w3.get(), window_list[1]);
   EXPECT_EQ(w6.get(), window_list[2]);
@@ -99,8 +101,8 @@ TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) {
   EXPECT_TRUE(wm::GetWindowState(w1.get())->is_dragged());
 
   // The dragged window should only be in the list once.
-  MruWindowTracker::WindowList window_list =
-      mru_window_tracker()->BuildWindowListIgnoreModal();
+  aura::Window::Windows window_list = WmWindowAura::ToAuraWindows(
+      mru_window_tracker()->BuildWindowListIgnoreModal());
   EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1.get()));
 }