Removes ShellPort::IsRunningInMash()

ash/laser/laser_pointer_controller_unittest.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/laser/laser_pointer_controller.h"
 
 #include "ash/laser/laser_pointer_controller_test_api.h"
 #include "ash/laser/laser_pointer_view.h"
+#include "ash/public/cpp/config.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 namespace {
 
 class LaserPointerControllerTest : public test::AshTestBase {
  public:
   LaserPointerControllerTest() {}
   ~LaserPointerControllerTest() override {}
@@ skipping 16 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(LaserPointerControllerTest);
 };
 
 }  // namespace
 
 // Test to ensure the class responsible for drawing the laser pointer receives
 // points from stylus movements as expected.
 TEST_F(LaserPointerControllerTest, LaserPointerRenderer) {
   // Crashes in mash mode: crbug.com/702657
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
   LaserPointerControllerTestApi controller_test_api_(controller_.get());
 
   // The laser pointer mode only works with stylus.
   GetEventGenerator().EnterPenPointerMode();
 
   // When disabled the laser pointer should not be showing.
   GetEventGenerator().MoveTouch(gfx::Point(1, 1));
   EXPECT_FALSE(controller_test_api_.IsShowingLaserPointer());
 
@@ skipping 56 matching lines @@
   GetEventGenerator().MoveTouch(gfx::Point(10, 10));
   GetEventGenerator().MoveTouch(gfx::Point(11, 11));
   EXPECT_FALSE(controller_test_api_.IsShowingLaserPointer());
   GetEventGenerator().ReleaseTouch();
 }
 
 // Test to ensure the class responsible for drawing the laser pointer handles
 // prediction as expected when it receives points from stylus movements.
 TEST_F(LaserPointerControllerTest, LaserPointerPrediction) {
   // Crashes in mash mode: crbug.com/702657
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
   LaserPointerControllerTestApi controller_test_api_(controller_.get());
 
   controller_test_api_.SetEnabled(true);
   // The laser pointer mode only works with stylus.
   GetEventGenerator().EnterPenPointerMode();
   GetEventGenerator().PressTouch();
   EXPECT_TRUE(controller_test_api_.IsShowingLaserPointer());
 
   EXPECT_EQ(1, controller_test_api_.laser_points().GetNumberOfPoints());
@@ skipping 17 matching lines @@
 
   // Verify releasing the stylus removes predicted points.
   GetEventGenerator().ReleaseTouch();
   EXPECT_TRUE(controller_test_api_.IsShowingLaserPointer());
   EXPECT_TRUE(controller_test_api_.IsFadingAway());
   EXPECT_EQ(0,
             controller_test_api_.predicted_laser_points().GetNumberOfPoints());
 }
 
 }  // namespace ash