mash: remove more shell/shelf WmWindow usage.

ash/app_list/app_list_presenter_delegate_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 <memory>
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
@@ skipping 130 matching lines @@
   generator.GestureTapAt(point_outside);
   EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests opening the app launcher on a non-primary display, then deleting the
 // display.
 TEST_P(AppListPresenterDelegateTest, NonPrimaryDisplay) {
   // Set up a screen with two displays (horizontally adjacent).
   UpdateDisplay("1024x768,1024x768");
 
-  std::vector<WmWindow*> root_windows = ShellPort::Get()->GetAllRootWindows();
+  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2u, root_windows.size());
-  WmWindow* secondary_root = root_windows[1];
+  aura::Window* secondary_root = root_windows[1];
   EXPECT_EQ("1024,0 1024x768", secondary_root->GetBoundsInScreen().ToString());
 
-  app_list_presenter_impl()->Show(
-      secondary_root->GetDisplayNearestWindow().id());
+  app_list_presenter_impl()->Show(display::Screen::GetScreen()
+                                      ->GetDisplayNearestWindow(secondary_root)
+                                      .id());
   EXPECT_TRUE(app_list_presenter_impl()->GetTargetVisibility());
 
   // Remove the secondary display. Shouldn't crash (http://crbug.com/368990).
   UpdateDisplay("1024x768");
 
   // Updating the displays should close the app list.
   EXPECT_FALSE(app_list_presenter_impl()->GetTargetVisibility());
 }
 
 // Tests opening the app launcher on a tiny display that is too small to contain
@@ skipping 13 matching lines @@
 
   app_list::AppListView* app_list = app_list_presenter_impl()->GetView();
   int app_list_view_top =
       app_list->anchor_rect().y() - app_list->bounds().height() / 2;
   const int kMinimalAppListMargin = 10;
 
   EXPECT_GE(app_list_view_top, kMinimalAppListMargin);
 }
 
 }  // namespace ash