Removes ShellPort::IsRunningInMash()

ash/rotator/screen_rotation_animator_unittest.cc

 // Copyright 2017 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/rotator/screen_rotation_animator.h"
 
 #include "ash/ash_switches.h"
+#include "ash/public/cpp/config.h"
 #include "ash/rotator/screen_rotation_animator_observer.h"
 #include "ash/rotator/test/screen_rotation_animator_test_api.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test_base.h"
 #include "base/callback_forward.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 140 matching lines @@
       base::MakeUnique<test::ScreenRotationAnimatorTestApi>(animator_.get());
   test_api()->DisableAnimationTimers();
 }
 
 void ScreenRotationAnimatorTest::WaitForCopyCallback() {
   run_loop_->Run();
 }
 
 TEST_F(ScreenRotationAnimatorTest, ShouldNotifyObserver) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   AnimationObserver observer;
   animator()->AddScreenRotationAnimatorObserver(&observer);
   EXPECT_FALSE(observer.notified());
 
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_FALSE(observer.notified());
 
   test_api()->CompleteAnimations();
   EXPECT_TRUE(observer.notified());
   EXPECT_FALSE(test_api()->HasActiveAnimations());
   animator()->RemoveScreenRotationAnimatorObserver(&observer);
 }
 
 TEST_F(ScreenRotationAnimatorTest, ShouldNotifyObserverOnce) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   AnimationObserver observer;
   animator()->AddScreenRotationAnimatorObserver(&observer);
   EXPECT_FALSE(observer.notified());
 
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_FALSE(observer.notified());
 
   animator()->Rotate(display::Display::ROTATE_180,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_FALSE(observer.notified());
 
   test_api()->CompleteAnimations();
   EXPECT_TRUE(observer.notified());
   EXPECT_FALSE(test_api()->HasActiveAnimations());
   animator()->RemoveScreenRotationAnimatorObserver(&observer);
 }
 
 TEST_F(ScreenRotationAnimatorTest, RotatesToDifferentRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   test_api()->CompleteAnimations();
   EXPECT_FALSE(test_api()->HasActiveAnimations());
 }
 
 TEST_F(ScreenRotationAnimatorTest, ShouldNotRotateTheSameRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   animator()->Rotate(display::Display::ROTATE_0,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_FALSE(test_api()->HasActiveAnimations());
 }
 
 // Simulates the situation that if there is a new rotation request during
 // animation, it should stop the animation immediately and add the new rotation
 // request to the |last_pending_request_|.
 TEST_F(ScreenRotationAnimatorTest, RotatesDuringRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   animator()->Rotate(display::Display::ROTATE_180,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   test_api()->CompleteAnimations();
   EXPECT_FALSE(test_api()->HasActiveAnimations());
   EXPECT_EQ(display::Display::ROTATE_180, GetDisplayRotation(display_id()));
 }
 
 // If there are multiple requests queued during animation, it should process the
 // last request and finish the rotation animation.
 TEST_F(ScreenRotationAnimatorTest, ShouldCompleteAnimations) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   animator()->Rotate(display::Display::ROTATE_180,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   animator()->Rotate(display::Display::ROTATE_270,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   test_api()->CompleteAnimations();
   EXPECT_FALSE(test_api()->HasActiveAnimations());
   EXPECT_EQ(display::Display::ROTATE_270, GetDisplayRotation(display_id()));
 }
 
 // Test enable smooth screen rotation code path.
 TEST_F(ScreenRotationAnimatorTest, RotatesToDifferentRotationWithCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kAshEnableSmoothScreenRotation);
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   test_api()->CompleteAnimations();
   EXPECT_FALSE(test_api()->HasActiveAnimations());
 }
 
 // If the external display is removed, it should not crash.
 TEST_F(ScreenRotationAnimatorTest, RemoveSecondaryDisplayAfterCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   UpdateDisplay("640x480,800x600");
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
 
   const unsigned int primary_display_id =
       display_manager()->GetDisplayAt(0).id();
   SetScreenRotationAnimator(
       display_manager()->GetDisplayAt(1).id(),
       base::Bind(&ScreenRotationAnimatorTest::RemoveSecondaryDisplay,
                  base::Unretained(this), "640x480"));
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kAshEnableSmoothScreenRotation);
   SetDisplayRotation(display_manager()->GetDisplayAt(1).id(),
                      display::Display::ROTATE_0);
   animator()->Rotate(display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ(primary_display_id, display_manager()->GetDisplayAt(0).id());
 }
 
 }  // namespace ash