[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/wm/panels/panel_window_resizer_unittest.cc

 // Copyright (c) 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/panels/panel_window_resizer.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
-#include "ash/wm_window.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
@@ skipping 88 matching lines @@
     EXPECT_EQ(kShellWindowId_PanelContainer, window->parent()->id());
   }
 
   // Ensure |first| and its shelf item come before those of |second|:
   // - |first| should be left of |second| in an LTR bottom-aligned shelf.
   // - |first| should be right of |second| in an RTL bottom-aligned shelf.
   // - |first| should be above |second| in a left- or right-aligned shelf.
   void CheckWindowAndItemPlacement(aura::Window* first, aura::Window* second) {
     Shelf* shelf = GetPrimaryShelf();
     const gfx::Rect first_item_bounds =
-        shelf->GetScreenBoundsOfItemIconForWindow(WmWindow::Get(first));
+        shelf->GetScreenBoundsOfItemIconForWindow(first);
     const gfx::Rect second_item_bounds =
-        shelf->GetScreenBoundsOfItemIconForWindow(WmWindow::Get(second));
+        shelf->GetScreenBoundsOfItemIconForWindow(second);
     if (!base::i18n::IsRTL()) {
       EXPECT_TRUE((first->bounds().x() < second->bounds().x()) ||
                   (first->bounds().y() < second->bounds().y()));
       EXPECT_TRUE((first_item_bounds.x() < second_item_bounds.x()) ||
                   (first_item_bounds.y() < second_item_bounds.y()));
     } else {
       EXPECT_TRUE((first->bounds().x() > second->bounds().x()) ||
                   (first->bounds().y() < second->bounds().y()));
       EXPECT_TRUE((first_item_bounds.x() > second_item_bounds.x()) ||
                   (first_item_bounds.y() < second_item_bounds.y()));
@@ skipping 411 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelWindowResizerTextDirectionTest,
                         testing::Bool());
 INSTANTIATE_TEST_CASE_P(NormalPanelPopup,
                         PanelWindowResizerTransientTest,
                         testing::Values(aura::client::WINDOW_TYPE_NORMAL,
                                         aura::client::WINDOW_TYPE_POPUP));
 
 }  // namespace ash