Renames WmShell to ShellPort

ash/shelf/shelf_widget_unittest.cc

Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index fcc2b012f9c8855376b7387f6fc97654feb45a39..b93a4d7ed54b179aa4d7981372ca0ff05183eea8 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -10,12 +10,12 @@
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
+#include "ash/shell_port.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
 #include "ash/wm_window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
@@ -52,23 +52,23 @@ TEST_F(ShelfWidgetTest, TestAlignment) {
   UpdateDisplay("400x400");
   {
     SCOPED_TRACE("Single Bottom");
-    TestLauncherAlignment(WmShell::Get()->GetPrimaryRootWindow(),
+    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_BOTTOM, gfx::Rect(0, 0, 400, 352));
   }
   {
     SCOPED_TRACE("Single Locked");
-    TestLauncherAlignment(WmShell::Get()->GetPrimaryRootWindow(),
+    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_BOTTOM_LOCKED,
                           gfx::Rect(0, 0, 400, 352));
   }
   {
     SCOPED_TRACE("Single Right");
-    TestLauncherAlignment(WmShell::Get()->GetPrimaryRootWindow(),
+    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_RIGHT, gfx::Rect(0, 0, 352, 400));
   }
   {
     SCOPED_TRACE("Single Left");
-    TestLauncherAlignment(WmShell::Get()->GetPrimaryRootWindow(),
+    TestLauncherAlignment(ShellPort::Get()->GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_LEFT,
                           gfx::Rect(kShelfSize, 0, 352, 400));
   }
@@ -77,7 +77,7 @@ TEST_F(ShelfWidgetTest, TestAlignment) {
 TEST_F(ShelfWidgetTest, TestAlignmentForMultipleDisplays) {
   const int kShelfSize = GetShelfConstant(SHELF_SIZE);
   UpdateDisplay("300x300,500x500");
-  std::vector<WmWindow*> root_windows = WmShell::Get()->GetAllRootWindows();
+  std::vector<WmWindow*> root_windows = ShellPort::Get()->GetAllRootWindows();
   {
     SCOPED_TRACE("Primary Bottom");
     TestLauncherAlignment(root_windows[0], SHELF_ALIGNMENT_BOTTOM,
@@ -154,7 +154,7 @@ TEST_F(ShelfWidgetTest, ShelfInitiallySizedAfterLogin) {
   UpdateDisplay("300x200,400x300");
 
   // Both displays have a shelf controller.
-  std::vector<WmWindow*> roots = WmShell::Get()->GetAllRootWindows();
+  std::vector<WmWindow*> roots = ShellPort::Get()->GetAllRootWindows();
   WmShelf* shelf1 = WmShelf::ForWindow(roots[0]);
   WmShelf* shelf2 = WmShelf::ForWindow(roots[1]);
   ASSERT_TRUE(shelf1);