mash: remove more shell/shelf WmWindow usage.

ash/shelf/shelf_widget_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/shelf/shelf_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
@@ skipping 21 matching lines @@
 }
 
 ShelfLayoutManager* GetShelfLayoutManager() {
   return GetShelfWidget()->shelf_layout_manager();
 }
 
 }  // namespace
 
 using ShelfWidgetTest = test::AshTestBase;
 
-void TestLauncherAlignment(WmWindow* root,
+void TestLauncherAlignment(aura::Window* root,
                            ShelfAlignment alignment,
                            const gfx::Rect& expected) {
-  root->GetRootWindowController()->GetShelf()->SetAlignment(alignment);
-  EXPECT_EQ(expected.ToString(),
-            root->GetDisplayNearestWindow().work_area().ToString());
+  GetRootWindowController(root)->GetShelf()->SetAlignment(alignment);
+  EXPECT_EQ(expected.ToString(), display::Screen::GetScreen()
+                                     ->GetDisplayNearestWindow(root)

[James Cook, 2017/05/17 23:41:49]

Aside: I really miss window->GetDisplayNearestWindow(). I wonder if we should
add a GetDisplay() helper to RootWindowController() for cases like this.

[msw, 2017/05/18 20:28:00]

Ditto, I think this is worth separate consideration/followup.

+                                     .work_area()
+                                     .ToString());
 }
 
 TEST_F(ShelfWidgetTest, TestAlignment) {
   UpdateDisplay("400x400");
   {
     SCOPED_TRACE("Single Bottom");
-    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
-                          SHELF_ALIGNMENT_BOTTOM, gfx::Rect(0, 0, 400, 352));
+    TestLauncherAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_BOTTOM,
+                          gfx::Rect(0, 0, 400, 352));
   }
   {
     SCOPED_TRACE("Single Locked");
-    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
+    TestLauncherAlignment(Shell::GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_BOTTOM_LOCKED,
                           gfx::Rect(0, 0, 400, 352));
   }
   {
     SCOPED_TRACE("Single Right");
-    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
-                          SHELF_ALIGNMENT_RIGHT, gfx::Rect(0, 0, 352, 400));
+    TestLauncherAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_RIGHT,
+                          gfx::Rect(0, 0, 352, 400));
   }
   {
     SCOPED_TRACE("Single Left");
-    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
-                          SHELF_ALIGNMENT_LEFT,
+    TestLauncherAlignment(Shell::GetPrimaryRootWindow(), SHELF_ALIGNMENT_LEFT,
                           gfx::Rect(kShelfSize, 0, 352, 400));
   }
 }
 
 TEST_F(ShelfWidgetTest, TestAlignmentForMultipleDisplays) {
   UpdateDisplay("300x300,500x500");
-  std::vector<WmWindow*> root_windows = ShellPort::Get()->GetAllRootWindows();
+  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   {
     SCOPED_TRACE("Primary Bottom");
     TestLauncherAlignment(root_windows[0], SHELF_ALIGNMENT_BOTTOM,
                           gfx::Rect(0, 0, 300, 252));
   }
   {
     SCOPED_TRACE("Primary Locked");
     TestLauncherAlignment(root_windows[0], SHELF_ALIGNMENT_BOTTOM_LOCKED,
                           gfx::Rect(0, 0, 300, 252));
   }
@@ skipping 56 matching lines @@
 }
 
 // Verifies shelf is created with correct size after user login and when its
 // container and status widget has finished sizing.
 // See http://crbug.com/252533
 TEST_F(ShelfWidgetTest, ShelfInitiallySizedAfterLogin) {
   SetUserLoggedIn(false);
   UpdateDisplay("300x200,400x300");
 
   // Both displays have a shelf controller.
-  std::vector<WmWindow*> roots = ShellPort::Get()->GetAllRootWindows();
+  aura::Window::Windows roots = Shell::GetAllRootWindows();
   WmShelf* shelf1 = WmShelf::ForWindow(roots[0]);
   WmShelf* shelf2 = WmShelf::ForWindow(roots[1]);
   ASSERT_TRUE(shelf1);
   ASSERT_TRUE(shelf2);
 
   // Both shelf controllers have a shelf widget.
   ShelfWidget* shelf_widget1 = shelf1->shelf_widget();
   ShelfWidget* shelf_widget2 = shelf2->shelf_widget();
   ASSERT_TRUE(shelf_widget1);
   ASSERT_TRUE(shelf_widget2);
@@ skipping 242 matching lines @@
 }
 
 TEST_F(ShelfWidgetTestWithInitializer, CreateLockedShelf) {
   // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.
   TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED,
                                    SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
                                    SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);
 }
 
 }  // namespace ash