Renames WmShell to ShellPort

ash/test/ash_test_base.cc

Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index faef0e2449cbf43c0fef3c280265de892d798a26..22a33c4711facb8fd208ee886ab7e21dd50ebc65 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -17,13 +17,13 @@
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
+#include "ash/shell_port.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_session_controller_client.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/wm/window_positioner.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
@@ -65,7 +65,7 @@ class AshEventGeneratorDelegate
       const gfx::Point& point_in_screen) const override {
     display::Screen* screen = display::Screen::GetScreen();
     display::Display display = screen->GetDisplayNearestPoint(point_in_screen);
-    return WmShell::Get()
+    return ShellPort::Get()
         ->GetRootWindowForDisplayId(display.id())
         ->aura_window()
         ->GetHost();
@@ -166,7 +166,7 @@ void AshTestBase::TearDown() {
 
 // static
 WmShelf* AshTestBase::GetPrimaryShelf() {
-  return WmShell::Get()
+  return ShellPort::Get()
       ->GetPrimaryRootWindow()
       ->GetRootWindowController()
       ->GetShelf();
@@ -222,7 +222,7 @@ std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget(
   params.delegate = delegate;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = bounds;
-  WmShell::Get()
+  ShellPort::Get()
       ->GetPrimaryRootWindow()
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(widget.get(), container_id,
@@ -272,8 +272,9 @@ aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType(
   } else {
     display::Display display =
         display::Screen::GetScreen()->GetDisplayMatching(bounds);
-    aura::Window* root =
-        WmShell::Get()->GetRootWindowForDisplayId(display.id())->aura_window();
+    aura::Window* root = ShellPort::Get()
+                             ->GetRootWindowForDisplayId(display.id())
+                             ->aura_window();
     gfx::Point origin = bounds.origin();
     ::wm::ConvertPointFromScreen(root, &origin);
     window->SetBounds(gfx::Rect(origin, bounds.size()));
@@ -361,7 +362,7 @@ void AshTestBase::UnblockUserSession() {
 void AshTestBase::DisableIME() {
   // WindowTreeHostManager isn't applicable to mash and IME is routed
   // differently in mash.
-  if (WmShell::Get()->IsRunningInMash())
+  if (ShellPort::Get()->IsRunningInMash())
     return;
 
   Shell::Get()->RemovePreTargetHandler(