mash: remove more shell/shelf WmWindow usage.

ash/wm/window_positioner_unittest.cc

 // Copyright 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/window_positioner.h"
 
 #include <string>
 
 #include "ash/scoped_root_window_for_new_windows.h"
 #include "ash/shell.h"
@@ skipping 12 matching lines @@
 
 namespace ash {
 
 using WindowPositionerTest = test::AshTestBase;
 
 TEST_F(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) {
   // Tests that for a screen that is narrower than kForceMaximizeWidthLimit
   // a new window gets maximized.
   UpdateDisplay("400x400,500x500");
   ScopedRootWindowForNewWindows root_for_new_windows(
-      ShellPort::Get()->GetAllRootWindows()[1]);
+      Shell::GetAllRootWindows()[1]);
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
   EXPECT_EQ(gfx::Rect(400, 0, 500, 452).ToString(),
             widget->GetWindowBoundsInScreen().ToString());
 }
 
 TEST_F(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
   UpdateDisplay("400x400,1400x900");
-  WmWindow* second_root_window = ShellPort::Get()->GetAllRootWindows()[1];
+  aura::Window* second_root_window = Shell::GetAllRootWindows()[1];
   ScopedRootWindowForNewWindows root_for_new_windows(second_root_window);
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
   gfx::Rect bounds = widget->GetWindowBoundsInScreen();
 
   // The window should be in the 2nd display with the default size.
   EXPECT_EQ("300x300", bounds.size().ToString());
-  EXPECT_TRUE(
-      second_root_window->GetDisplayNearestWindow().bounds().Contains(bounds));
+  EXPECT_TRUE(display::Screen::GetScreen()
+                  ->GetDisplayNearestWindow(second_root_window)
+                  .bounds()
+                  .Contains(bounds));
 }
 
 // Tests that second window inherits first window's maximized state as well as
 // its restore bounds.
 TEST_F(WindowPositionerTest, SecondMaximizedWindowHasProperRestoreSize) {
   UpdateDisplay("1400x900");
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget1 = shell::ToplevelWindow::CreateToplevelWindow(params);
@@ skipping 136 matching lines @@
   widget1->SetFullscreen(false);
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 
   // Closing 2nd widget triggers the rearrange logic but the 1st
   // widget should stay in the current size.
   widget2->CloseNow();
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 }
 
 }  // namespace ash