Removes ShellPort::IsRunningInMash()

ash/wm/window_cycle_controller_unittest.cc

Index: ash/wm/window_cycle_controller_unittest.cc
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc
index ca1a965d72a2fe9cd86b2b56e28e4e24706da55e..1e6224045fe39420ed211e572dbced3fabee0608 100644
--- a/ash/wm/window_cycle_controller_unittest.cc
+++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -8,13 +8,13 @@
 #include <memory>
 
 #include "ash/focus_cycler.h"
+#include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/scoped_root_window_for_new_windows.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_app_list_view_presenter_impl.h"
@@ -482,7 +482,7 @@ TEST_F(WindowCycleControllerTest, MostRecentlyUsed) {
 // Tests that beginning window selection hides the app list.
 TEST_F(WindowCycleControllerTest, SelectingHidesAppList) {
   // TODO: fails in mash because of AppListPresenter. http://crbug.com/696028.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   // The tested behavior relies on the app list presenter implementation.
@@ -614,7 +614,7 @@ TEST_F(WindowCycleControllerTest, CycleMruPanelDestroyed) {
 // Tests that the tab key events are not sent to the window.
 TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) {
   // TODO: investigate failure in mash. http://crbug.com/698894.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   std::unique_ptr<Window> w0(CreateTestWindowInShellWithId(0));
@@ -638,7 +638,7 @@ TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) {
 // While the UI is active, mouse events are captured.
 TEST_F(WindowCycleControllerTest, MouseEventsCaptured) {
   // TODO: investigate failure in mash. http://crbug.com/698894.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   // This delegate allows the window to receive mouse events.
@@ -716,7 +716,7 @@ TEST_F(WindowCycleControllerTest, TabPastFullscreenWindow) {
 // display it's on. See crbug.com/675718
 TEST_F(WindowCycleControllerTest, MultiDisplayPositioning) {
   // TODO: investigate failure in mash. http://crbug.com/698894.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();