Removes ShellPort::IsRunningInMash()

ash/wm/lock_state_controller_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/wm/lock_state_controller.h"
 
 #include <memory>
 #include <utility>
 
+#include "ash/public/cpp/config.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
-#include "ash/shell_port.h"
 #include "ash/shutdown_controller.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/lock_state_controller_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_controller_client.h"
 #include "ash/test/test_session_state_animator.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/session_state_animator.h"
@@ skipping 63 matching lines @@
     test_api_.reset(new LockStateControllerTestApi(lock_state_controller_));
     test_api_->set_shutdown_controller(&test_shutdown_controller_);
 
     power_button_controller_ = Shell::Get()->power_button_controller();
 
     shell_delegate_ =
         static_cast<TestShellDelegate*>(Shell::Get()->shell_delegate());
   }
 
   void TearDown() override {
-    const bool is_mash = ShellPort::Get()->IsRunningInMash();
+    const bool is_mash = Shell::GetAshConfig() == Config::MASH;
     AshTestBase::TearDown();
     // Mash shuts down DBus during normal destruction.
     if (!is_mash)
       chromeos::DBusThreadManager::Shutdown();
   }
 
  protected:
   void GenerateMouseMoveEvent() {
     ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
     generator.MoveMouseTo(10, 10);
@@ skipping 287 matching lines @@
 
   // Hold the button again and check that we start shutting down.
   PressPowerButton();
 
   ExpectShutdownAnimationStarted();
 
   EXPECT_EQ(0, NumShutdownRequests());
   // Make sure a mouse move event won't show the cursor.
   GenerateMouseMoveEvent();
   // TODO: CursorManager not created in mash. http://crbug.com/631103.
-  if (!ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() != Config::MASH)
     EXPECT_FALSE(cursor_visible());
 
   EXPECT_TRUE(test_api_->real_shutdown_timer_is_running());
   test_api_->trigger_real_shutdown_timeout();
   EXPECT_EQ(1, NumShutdownRequests());
 }
 
 // Test that we start shutting down immediately if the power button is pressed
 // while we're not logged in on an unofficial system.
 TEST_F(LockStateControllerTest, LegacyNotLoggedIn) {
@@ skipping 390 matching lines @@
 // display an animation, we should just blank the screen.
 TEST_F(LockStateControllerTest, ShutdownWithoutButton) {
   Initialize(false, LoginStatus::USER);
   lock_state_controller_->OnAppTerminating();
 
   EXPECT_TRUE(test_animator_->AreContainersAnimated(
       SessionStateAnimator::kAllNonRootContainersMask,
       SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY));
   GenerateMouseMoveEvent();
   // TODO: CursorManager not created in mash. http://crbug.com/631103.
-  if (!ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() != Config::MASH)
     EXPECT_FALSE(cursor_visible());
 }
 
 // Test that we display the fast-close animation and shut down when we get an
 // outside request to shut down (e.g. from the login or lock screen).
 TEST_F(LockStateControllerTest, RequestShutdownFromLoginScreen) {
   Initialize(false, LoginStatus::NOT_LOGGED_IN);
 
   lock_state_controller_->RequestShutdown();
 
   ExpectShutdownAnimationStarted();
   Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
 
   GenerateMouseMoveEvent();
   // TODO: CursorManager not created in mash. http://crbug.com/631103.
-  if (!ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() != Config::MASH)
     EXPECT_FALSE(cursor_visible());
 
   EXPECT_EQ(0, NumShutdownRequests());
   EXPECT_TRUE(test_api_->real_shutdown_timer_is_running());
   test_api_->trigger_real_shutdown_timeout();
   EXPECT_EQ(1, NumShutdownRequests());
 }
 
 TEST_F(LockStateControllerTest, RequestShutdownFromLockScreen) {
   Initialize(false, LoginStatus::USER);
 
   SystemLocks();
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
   ExpectPostLockAnimationFinished();
 
   lock_state_controller_->RequestShutdown();
 
   ExpectShutdownAnimationStarted();
   Advance(SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN);
 
   GenerateMouseMoveEvent();
   // TODO: CursorManager not created in mash. http://crbug.com/631103.
-  if (!ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() != Config::MASH)
     EXPECT_FALSE(cursor_visible());
 
   EXPECT_EQ(0, NumShutdownRequests());
   EXPECT_TRUE(test_api_->real_shutdown_timer_is_running());
   test_api_->trigger_real_shutdown_timeout();
   EXPECT_EQ(1, NumShutdownRequests());
 }
 
 TEST_F(LockStateControllerTest, RequestAndCancelShutdownFromLockScreen) {
   Initialize(false, LoginStatus::USER);
@@ skipping 158 matching lines @@
 
   Advance(SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
 
   ExpectUnlockAfterUIDestroyedAnimationFinished();
 
   ExpectUnlockedState();
 }
 
 TEST_F(LockStateControllerTest, Screenshot) {
   // TODO: fails because of no screenshot in mash. http://crbug.com/698033.
-  if (ShellPort::Get()->IsRunningInMash())
+  if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   test::TestScreenshotDelegate* delegate = GetScreenshotDelegate();
   delegate->set_can_take_screenshot(true);
 
   EnableMaximizeMode(false);
 
   // Screenshot handling should not be active when not in maximize mode.
   ASSERT_EQ(0, delegate->handle_take_screenshot_count());
   PressVolumeDown();
@@ skipping 29 matching lines @@
   ASSERT_EQ(0, delegate->handle_take_screenshot_count());
   PressVolumeDown();
   PressPowerButton();
   ReleasePowerButton();
   ReleaseVolumeDown();
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
 }
 
 }  // namespace test
 }  // namespace ash