mash: remove more shell/shelf WmWindow usage.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 261 matching lines @@
 class ShelfAppBrowserTest : public ExtensionBrowserTest {
  protected:
   ShelfAppBrowserTest() : shelf_(NULL), model_(NULL), controller_(NULL) {}
 
   ~ShelfAppBrowserTest() override {}
 
   void SetUpOnMainThread() override {
     // Ensure ash starts the session and creates the shelf and controller.
     SessionControllerClient::FlushForTesting();
 
-    shelf_ =
-        ash::WmShelf::ForWindow(ash::ShellPort::Get()->GetPrimaryRootWindow());
+    shelf_ = ash::WmShelf::ForWindow(ash::Shell::GetPrimaryRootWindow());
     model_ = ash::Shell::Get()->shelf_model();
     controller_ = ChromeLauncherController::instance();
     ASSERT_TRUE(controller_);
     ExtensionBrowserTest::SetUpOnMainThread();
   }
 
   size_t NumberOfDetectedLauncherBrowsers(bool show_all_tabs) {
     ash::ShelfItemDelegate* item_controller =
         controller_->GetBrowserShortcutLauncherItemController();
     return item_controller
@@ skipping 76 matching lines @@
       base::RunLoop().RunUntilIdle();
       test->RunMessageLoopUntilAnimationsDone();
     }
   }
 
   // Creates a context menu for the existing browser shortcut item.
   std::unique_ptr<LauncherContextMenu> CreateBrowserItemContextMenu() {
     int index = model_->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);
     DCHECK_GE(index, 0);
     ash::ShelfItem item = model_->items()[index];
-    ash::WmShelf* shelf =
-        ash::WmShelf::ForWindow(ash::WmWindow::Get(CurrentContext()));
+    ash::WmShelf* shelf = ash::WmShelf::ForWindow(CurrentContext());
     std::unique_ptr<LauncherContextMenu> menu(
         LauncherContextMenu::Create(controller_, &item, shelf));
     return menu;
   }
 
   aura::Window* CurrentContext() {
     aura::Window* root_window = ash::Shell::GetRootWindowForNewWindows();
     DCHECK(root_window);
     return root_window;
   }
@@ skipping 1505 matching lines @@
 // the launcher in the secondary monitor.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, MultiDisplayBasicDragAndDrop) {
   // Update the display configuration to add a secondary display.
   display::test::DisplayManagerTestApi(ash::Shell::Get()->display_manager())
       .UpdateDisplay("800x800,801+0-800x800");
 
   // Get a number of interfaces we need.
   DCHECK_EQ(ash::Shell::GetAllRootWindows().size(), 2U);
   aura::Window* secondary_root_window = ash::Shell::GetAllRootWindows()[1];
   ash::WmShelf* secondary_shelf =
-      ash::WmShelf::ForWindow(ash::WmWindow::Get(secondary_root_window));
+      ash::WmShelf::ForWindow(secondary_root_window);
 
   ui::test::EventGenerator generator(secondary_root_window, gfx::Point());
   ash::test::ShelfViewTestAPI test(secondary_shelf->GetShelfViewForTesting());
   AppListService* service = AppListService::Get();
 
   // There should be two items in our shelf by this time.
   EXPECT_EQ(2, model_->item_count());
   EXPECT_FALSE(service->IsAppListVisible());
 
   // Open the app list menu and check that the drag and drop host was set.
@@ skipping 487 matching lines @@
 
   // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
   std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }