Removes ShellPort::IsRunningInMash()

ash/wm/panels/panel_layout_manager_unittest.cc

Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 449ca6f7d5413a4ef9404d564922a525f8250be0..52c080499d23ccb48284fc9d8d6316d946401bbd 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/panels/panel_layout_manager.h"
 
+#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ -14,7 +15,6 @@
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_view_test_api.h"
@@ -305,7 +305,7 @@ TEST_P(PanelLayoutManagerTextDirectionTest, AddOnePanel) {
 TEST_F(PanelLayoutManagerTest, UndockTest) {
   // TODO: mash doesn't support SetFirstDisplayAsInternalDisplay().
   // http://crbug.com/698091.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   std::vector<display::ManagedDisplayInfo> info_list;
@@ -341,7 +341,7 @@ TEST_F(PanelLayoutManagerTest, UndockTest) {
 TEST_F(PanelLayoutManagerTest, DockUndockTest) {
   // TODO: mash doesn't support SetFirstDisplayAsInternalDisplay().
   // http://crbug.com/698091.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   std::vector<display::ManagedDisplayInfo> info_list;
@@ -507,7 +507,7 @@ TEST_F(PanelLayoutManagerTest, MultiplePanelCallout) {
   EXPECT_TRUE(IsPanelCalloutVisible(w3.get()));
 
   // TODO: investigate failure. http://crbug.com/698887.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   wm::ActivateWindow(w1.get());
@@ -542,7 +542,7 @@ TEST_F(PanelLayoutManagerTest, RemoveLeftPanel) {
 
 TEST_F(PanelLayoutManagerTest, RemoveMiddlePanel) {
   // TODO: fails because of ShelfModel. http://crbug.com/698878.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   gfx::Rect bounds(0, 0, 201, 201);
@@ -561,7 +561,7 @@ TEST_F(PanelLayoutManagerTest, RemoveMiddlePanel) {
 
 TEST_F(PanelLayoutManagerTest, RemoveRightPanel) {
   // TODO: fails because of ShelfModel. http://crbug.com/698878.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   gfx::Rect bounds(0, 0, 201, 201);
@@ -580,7 +580,7 @@ TEST_F(PanelLayoutManagerTest, RemoveRightPanel) {
 
 TEST_F(PanelLayoutManagerTest, RemoveNonActivePanel) {
   // TODO: fails because of ShelfModel. http://crbug.com/698878.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   gfx::Rect bounds(0, 0, 201, 201);
@@ -675,7 +675,7 @@ TEST_F(PanelLayoutManagerTest, MinimizeRestorePanel) {
 
 TEST_F(PanelLayoutManagerTest, PanelMoveBetweenMultipleDisplays) {
   // TODO: fails because of ShelfModel. http://crbug.com/698878.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   // Keep the displays wide so that shelves have enough space for launcher