Moves couple of WmShell methods to standalone functions

chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc

Index: chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
index 84b19b62b66a4b538e57177fc42f03c50a234271..460ddf4d5ffb95b5ea30a57f7e8b078487354102 100644
--- a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
@@ -7,10 +7,10 @@
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
+#include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/app_list/presenter/app_list.h"
@@ -20,19 +20,19 @@ using AppListTest = InProcessBrowserTest;
 
 // An integration test to toggle the app list by pressing the shelf button.
 IN_PROC_BROWSER_TEST_F(AppListTest, PressAppListButtonToShowAndDismiss) {
-  ash::Shell* shell = ash::Shell::Get();
   ash::WmShelf* shelf =
-      ash::WmShelf::ForWindow(ash::WmShell::Get()->GetActiveWindow());
+      ash::WmShelf::ForWindow(ash::WmWindow::Get(ash::wm::GetActiveWindow()));
   ash::ShelfWidget* shelf_widget = shelf->shelf_widget();
   ash::AppListButton* app_list_button = shelf_widget->GetAppListButton();
 
   ash::WmWindow* root_window =
-      ash::WmShell::Get()->GetActiveWindow()->GetRootWindow();
+      ash::WmWindow::Get(ash::wm::GetActiveWindow())->GetRootWindow();
   ash::WmWindow* app_list_container = root_window->GetChildByShellWindowId(
       ash::kShellWindowId_AppListContainer);
   ui::test::EventGenerator generator(shelf_widget->GetNativeWindow());
 
   // Click the app list button to show the app list.
+  ash::Shell* shell = ash::Shell::Get();
   EXPECT_FALSE(shell->app_list()->GetTargetVisibility());
   EXPECT_EQ(0u, app_list_container->GetChildren().size());
   EXPECT_FALSE(app_list_button->is_showing_app_list());