Removes ShellPort::IsRunningInMash()

ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

Index: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
index 1a30d35e7d69905d21ba0a1806ce6ec7fad5d4c8..f907f6fd27ffb71e43c11e42afe84c581cd53a54 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -7,12 +7,12 @@
 #include <utility>
 #include <vector>
 
+#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"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
@@ -168,7 +168,7 @@ TEST_F(AshPopupAlignmentDelegateTest, DisplayResize) {
 
 TEST_F(AshPopupAlignmentDelegateTest, DockedMode) {
   // TODO: needs unified mode. http://crbug.com/698024.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   const gfx::Rect toast_size(0, 0, 10, 10);
@@ -223,7 +223,7 @@ TEST_F(AshPopupAlignmentDelegateTest, Extended) {
 
 TEST_F(AshPopupAlignmentDelegateTest, Unified) {
   // TODO: needs unified mode. http://crbug.com/698024.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   display_manager()->SetUnifiedDesktopEnabled(true);