Removes ShellPort::IsRunningInMash()

ash/autoclick/autoclick_unittest.cc

 // Copyright 2013 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/autoclick/autoclick_controller.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/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
@@ skipping 48 matching lines @@
   void SetUp() override {
     test::AshTestBase::SetUp();
     Shell::Get()->AddPreTargetHandler(&mouse_event_capturer_);
     GetAutoclickController()->SetAutoclickDelay(base::TimeDelta());
 
     // Move mouse to deterministic location at the start of each test.
     GetEventGenerator().MoveMouseTo(100, 100);
 
     // Make sure the display is initialized so we don't fail the test due to any
     // input events caused from creating the display.
-    if (!ShellPort::Get()->IsRunningInMash())
+    if (Shell::GetAshConfig() != Config::MASH)
       Shell::Get()->display_manager()->UpdateDisplays();
     RunAllPendingInMessageLoop();
   }
 
   void TearDown() override {
     Shell::Get()->RemovePreTargetHandler(&mouse_event_capturer_);
     test::AshTestBase::TearDown();
   }
 
   void MoveMouseWithFlagsTo(int x, int y, ui::EventFlags flags) {
@@ skipping 200 matching lines @@
   aura::test::EventCountDelegate delegate;
   std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
       &delegate, 123, gfx::Rect(50, 50, 100, 100)));
   window->Show();
   events = WaitForMouseEvents();
   EXPECT_EQ(0u, events.size());
   EXPECT_EQ("1 1 0", delegate.GetMouseMotionCountsAndReset());
 }
 
 }  // namespace ash