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

ash/wm/panels/panel_layout_manager_unittest.cc

 // Copyright (c) 2012 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_layout_manager.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"
@@ skipping 123 matching lines @@
     gfx::Rect window1_bounds = panel1->GetBoundsInRootWindow();
     gfx::Rect window2_bounds = panel2->GetBoundsInRootWindow();
 
     EXPECT_FALSE(window1_bounds.Intersects(window2_bounds));
   }
 
   void IsPanelAboveLauncherIcon(aura::Window* panel) {
     // Waits until all shelf view animations are done.
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
 
-    WmWindow* wm_panel = WmWindow::Get(panel);
-    Shelf* shelf = wm_panel->GetRootWindowController()->shelf();
-    gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(wm_panel);
+    Shelf* shelf = GetShelfForWindow(panel);
+    gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.width() == 0 && icon_bounds.height() == 0);
 
     gfx::Rect window_bounds = panel->GetBoundsInScreen();
     ASSERT_LT(icon_bounds.width(), window_bounds.width());
     ASSERT_LT(icon_bounds.height(), window_bounds.height());
     gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen();
     const ShelfAlignment alignment = shelf->alignment();
 
     if (IsHorizontal(alignment)) {
       // The horizontal bounds of the panel window should contain the bounds of
@@ skipping 13 matching lines @@
       EXPECT_EQ(shelf_bounds.x(), window_bounds.right());
     else
       EXPECT_EQ(shelf_bounds.y(), window_bounds.bottom());
   }
 
   void IsCalloutAboveLauncherIcon(aura::Window* panel) {
     // Flush the message loop, since callout updates use a delayed task.
     base::RunLoop().RunUntilIdle();
     views::Widget* widget = GetCalloutWidgetForPanel(panel);
 
-    WmWindow* wm_panel = WmWindow::Get(panel);
-    Shelf* shelf = wm_panel->GetRootWindowController()->shelf();
-    gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(wm_panel);
+    Shelf* shelf = GetShelfForWindow(panel);
+    gfx::Rect icon_bounds = shelf->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
     gfx::Rect panel_bounds = panel->GetBoundsInScreen();
     gfx::Rect callout_bounds = widget->GetWindowBoundsInScreen();
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
     EXPECT_TRUE(widget->IsVisible());
 
     const ShelfAlignment alignment = shelf->alignment();
     if (alignment == SHELF_ALIGNMENT_LEFT)
@@ skipping 31 matching lines @@
     gfx::Rect bounds = test_api.GetButton(index)->GetBoundsInScreen();
 
     ui::test::EventGenerator& event_generator = GetEventGenerator();
     event_generator.MoveMouseTo(bounds.CenterPoint());
     event_generator.ClickLeftButton();
 
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
   Shelf* GetShelfForWindow(aura::Window* window) {
-    return WmWindow::Get(window)->GetRootWindowController()->GetShelf();
+    return RootWindowController::ForWindow(window)->shelf();
   }
 
-  void SetAlignment(aura::Window* root_window, ShelfAlignment alignment) {
-    GetShelfForWindow(root_window)->SetAlignment(alignment);
+  void SetAlignment(aura::Window* window, ShelfAlignment alignment) {
+    GetShelfForWindow(window)->SetAlignment(alignment);
   }
 
   void SetShelfAutoHideBehavior(aura::Window* window,
                                 ShelfAutoHideBehavior behavior) {
     Shelf* shelf = GetShelfForWindow(window);
     shelf->SetAutoHideBehavior(behavior);
     test::ShelfViewTestAPI test_api(shelf->GetShelfViewForTesting());
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
@@ skipping 372 matching lines @@
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w2(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w3(CreatePanelWindow(bounds));
 
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
   int window_x1 = w1->GetBoundsInRootWindow().CenterPoint().x();
   int window_x2 = w2->GetBoundsInRootWindow().CenterPoint().x();
   int window_x3 = w3->GetBoundsInRootWindow().CenterPoint().x();
   Shelf* shelf = GetPrimaryShelf();
-  int icon_x1 =
-      shelf->GetScreenBoundsOfItemIconForWindow(WmWindow::Get(w1.get())).x();
-  int icon_x2 =
-      shelf->GetScreenBoundsOfItemIconForWindow(WmWindow::Get(w2.get())).x();
+  int icon_x1 = shelf->GetScreenBoundsOfItemIconForWindow(w1.get()).x();
+  int icon_x2 = shelf->GetScreenBoundsOfItemIconForWindow(w2.get()).x();
   // TODO(crbug.com/698887): investigate failure in Mash.
   if (Shell::GetAshConfig() != Config::MASH)
     EXPECT_EQ(window_x2 - window_x1, window_x3 - window_x2);
   // New shelf items for panels are inserted before existing panel items.
   EXPECT_LT(window_x2, window_x1);
   EXPECT_LT(window_x3, window_x2);
   int spacing = window_x2 - window_x1;
   EXPECT_GT(std::abs(spacing), std::abs(icon_x2 - icon_x1));
 }
 
@@ skipping 282 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash