Converts MruWindowTracker to work with common types

ash/wm/window_cycle_controller_unittest.cc

 // Copyright 2014 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/window_cycle_controller.h"
 
 #include <algorithm>
 #include <memory>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
@@ skipping 28 matching lines @@
 
   // ui::EventHandler:
   void OnKeyEvent(ui::KeyEvent* event) override { key_events_++; }
 
  private:
   size_t key_events_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyEventCounter);
 };
 
+bool IsWindowMinimized(aura::Window* window) {
+  return WmWindowAura::Get(window)->GetWindowState()->IsMinimized();
+}
+
 }  // namespace
 
 using aura::test::CreateTestWindowWithId;
 using aura::test::TestWindowDelegate;
 using aura::Window;
 
 class WindowCycleControllerTest : public test::AshTestBase {
  public:
   WindowCycleControllerTest() {}
   ~WindowCycleControllerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
     ASSERT_TRUE(test::TestShelfDelegate::instance());
 
     shelf_view_test_.reset(new test::ShelfViewTestAPI(
         test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view()));
     shelf_view_test_->SetAnimationDuration(1);
   }
 
   aura::Window* CreatePanelWindow() {
     gfx::Rect rect(100, 100);
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         NULL, ui::wm::WINDOW_TYPE_PANEL, 0, rect);
     test::TestShelfDelegate::instance()->AddShelfItem(window);
     shelf_view_test_->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
-  const WindowCycleList::WindowList& GetWindows(
-      WindowCycleController* controller) {
-    return controller->window_cycle_list()->windows();
+  const aura::Window::Windows GetWindows(WindowCycleController* controller) {
+    return WmWindowAura::ToAuraWindows(
+        controller->window_cycle_list()->windows());
   }
 
  private:
   std::unique_ptr<test::ShelfViewTestAPI> shelf_view_test_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowCycleControllerTest);
 };
 
 TEST_F(WindowCycleControllerTest, HandleCycleWindowBaseCases) {
   WindowCycleController* controller =
@@ skipping 410 matching lines @@
 // are passed.
 TEST_F(WindowCycleControllerTest, CyclePreservesMinimization) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   wm::ActivateWindow(window1.get());
   wm::GetWindowState(window1.get())->Minimize();
   wm::ActivateWindow(window0.get());
-  EXPECT_TRUE(wm::IsWindowMinimized(window1.get()));
+  EXPECT_TRUE(IsWindowMinimized(window1.get()));
 
   // On window 2.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  EXPECT_FALSE(wm::IsWindowMinimized(window1.get()));
+  EXPECT_FALSE(IsWindowMinimized(window1.get()));
 
   // Back on window 1.
   controller->HandleCycleWindow(WindowCycleController::FORWARD);
-  EXPECT_TRUE(wm::IsWindowMinimized(window1.get()));
+  EXPECT_TRUE(IsWindowMinimized(window1.get()));
 
   controller->StopCycling();
 
-  EXPECT_TRUE(wm::IsWindowMinimized(window1.get()));
+  EXPECT_TRUE(IsWindowMinimized(window1.get()));
 }
 
 // Tests cycles between panel and normal windows.
 TEST_F(WindowCycleControllerTest, CyclePanels) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
   std::unique_ptr<aura::Window> panel0(CreatePanelWindow());
   std::unique_ptr<aura::Window> panel1(CreatePanelWindow());
@@ skipping 87 matching lines @@
   generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
   EXPECT_EQ(0u, key_count.GetCountAndReset());
   generator.ReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
   EXPECT_EQ(0u, key_count.GetCountAndReset());
   generator.ReleaseKey(ui::VKEY_MENU, ui::EF_NONE);
   EXPECT_TRUE(wm::GetWindowState(w1.get())->IsActive());
   EXPECT_EQ(0u, key_count.GetCountAndReset());
 }
 
 }  // namespace ash