Renames WmShell to ShellPort

ash/rotator/screen_rotation_animator_unittest.cc

Index: ash/rotator/screen_rotation_animator_unittest.cc
diff --git a/ash/rotator/screen_rotation_animator_unittest.cc b/ash/rotator/screen_rotation_animator_unittest.cc
index cb1daeeb54b024a31f637266014291b72dc41e6b..b33aacf3315fdad6344d1e86bffd373add01732e 100644
--- a/ash/rotator/screen_rotation_animator_unittest.cc
+++ b/ash/rotator/screen_rotation_animator_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/ash_switches.h"
 #include "ash/rotator/screen_rotation_animator.h"

[James Cook, 2017/04/10 22:00:41]

nit: blank line below

[sky, 2017/04/10 22:16:25]

Done.

+#include "ash/ash_switches.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 "ash/wm_shell.h"
 #include "base/callback_forward.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ -164,8 +164,8 @@ void ScreenRotationAnimatorTest::WaitForCopyCallback() {
 
 TEST_F(ScreenRotationAnimatorTest, ShouldNotifyObserver) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -187,8 +187,8 @@ TEST_F(ScreenRotationAnimatorTest, ShouldNotifyObserver) {
 
 TEST_F(ScreenRotationAnimatorTest, ShouldNotifyObserverOnce) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -214,8 +214,8 @@ TEST_F(ScreenRotationAnimatorTest, ShouldNotifyObserverOnce) {
 
 TEST_F(ScreenRotationAnimatorTest, RotatesToDifferentRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -231,8 +231,8 @@ TEST_F(ScreenRotationAnimatorTest, RotatesToDifferentRotation) {
 
 TEST_F(ScreenRotationAnimatorTest, ShouldNotRotateTheSameRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -248,8 +248,8 @@ TEST_F(ScreenRotationAnimatorTest, ShouldNotRotateTheSameRotation) {
 // request to the |last_pending_request_|.
 TEST_F(ScreenRotationAnimatorTest, RotatesDuringRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -270,8 +270,8 @@ TEST_F(ScreenRotationAnimatorTest, RotatesDuringRotation) {
 // last request and finish the rotation animation.
 TEST_F(ScreenRotationAnimatorTest, ShouldCompleteAnimations) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -297,8 +297,8 @@ TEST_F(ScreenRotationAnimatorTest, ShouldCompleteAnimations) {
 // Test enable smooth screen rotation code path.
 TEST_F(ScreenRotationAnimatorTest, RotatesToDifferentRotationWithCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
@@ -318,8 +318,8 @@ TEST_F(ScreenRotationAnimatorTest, RotatesToDifferentRotationWithCopyCallback) {
 // If the external display is removed, it should not crash.
 TEST_F(ScreenRotationAnimatorTest, RemoveSecondaryDisplayAfterCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
-  if (WmShell::Get()->IsRunningInMash()) {
-    ASSERT_TRUE(WmShell::Get()->GetDisplayInfo(display_id()).id() !=
+  if (ShellPort::Get()->IsRunningInMash()) {
+    ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }