Removes ShellPort::IsRunningInMash()

ash/test/ash_test.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test.h"
 
+#include "ash/public/cpp/config.h"
 #include "ash/root_window_controller.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_impl.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
@@ skipping 84 matching lines @@
   return widget;
 }
 
 display::Display AshTest::GetSecondaryDisplay() {
   return test_impl_->GetSecondaryDisplay();
 }
 
 bool AshTest::SetSecondaryDisplayPlacement(
     display::DisplayPlacement::Position position,
     int offset) {
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     NOTIMPLEMENTED();
     return false;
   }
   return test_impl_->SetSecondaryDisplayPlacement(position, offset);
 }
 
 void AshTest::ConfigureWidgetInitParamsForDisplay(
     WmWindow* window,
     views::Widget::InitParams* init_params) {
   test_impl_->ConfigureWidgetInitParamsForDisplay(window, init_params);
@@ skipping 15 matching lines @@
 
 void AshTest::SetUp() {
   test_impl_->SetUp();
 }
 
 void AshTest::TearDown() {
   test_impl_->TearDown();
 }
 
 }  // namespace ash