[mus+ash] Removes WmWindow from ash/wm/window_cycle_*

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/focus_cycler.h"
@@ skipping 55 matching lines @@
   void OnMouseEvent(ui::MouseEvent* event) override { mouse_events_++; }
 
  private:
   int key_events_;
   int mouse_events_;
 
   DISALLOW_COPY_AND_ASSIGN(EventCounter);
 };
 
 bool IsWindowMinimized(aura::Window* window) {
-  return WmWindow::Get(window)->GetWindowState()->IsMinimized();
+  return wm::GetWindowState(window)->IsMinimized();
 }
 
 }  // namespace
 
 using aura::test::CreateTestWindowWithId;
 using aura::test::TestWindowDelegate;
 using aura::Window;
 
 class WindowCycleControllerTest : public test::AshTestBase {
  public:
@@ skipping 12 matching lines @@
 
   aura::Window* CreatePanelWindow() {
     gfx::Rect rect(100, 100);
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         NULL, ui::wm::WINDOW_TYPE_PANEL, 0, rect);
     shelf_view_test_->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
   const aura::Window::Windows GetWindows(WindowCycleController* controller) {
-    return WmWindow::ToAuraWindows(controller->window_cycle_list()->windows());
+    return controller->window_cycle_list()->windows();
   }
 
   const views::Widget* GetWindowCycleListWidget() const {
     return Shell::Get()
         ->window_cycle_controller()
         ->window_cycle_list()
         ->widget();
   }
 
  private:
@@ skipping 641 matching lines @@
     // Base case sets the expectation for other cases.
     if (expected_bounds.IsEmpty())
       expected_bounds = display_relative_bounds;
     else
       EXPECT_EQ(expected_bounds, display_relative_bounds);
     controller->CompleteCycling();
   }
 }
 
 }  // namespace ash