cros: Do not cache |root_window| in ScreenRotationAnimator.

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/display/window_tree_host_manager.h"
 #include "ash/public/cpp/config.h"
 #include "ash/rotator/screen_rotation_animator_observer.h"
@@ skipping 33 matching lines @@
   Shell::Get()->display_manager()->SetDisplayRotation(
       display_id, rotation,
       display::Display::RotationSource::ROTATION_SOURCE_USER);
 }
 
 OverviewButtonTray* GetTray() {
   return StatusAreaWidgetTestHelper::GetStatusAreaWidget()
       ->overview_button_tray();
 }
 
+aura::Window* GetRootWindow(int64_t display_id) {
+  return Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
+      display_id);
+}
+
 class AnimationObserver : public ScreenRotationAnimatorObserver {
  public:
   AnimationObserver() {}
 
   bool notified() const { return notified_; }
 
   void OnScreenRotationAnimationFinished(
       ScreenRotationAnimator* animator) override {
     notified_ = true;
   }
 
  private:
   bool notified_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationObserver);
 };
 
 class TestScreenRotationAnimator : public ScreenRotationAnimator {
  public:
-  TestScreenRotationAnimator(int64_t display_id,
+  TestScreenRotationAnimator(aura::Window* root_window,
                              const base::Closure& before_callback,
                              const base::Closure& after_callback);
   ~TestScreenRotationAnimator() override {}
 
  private:
   CopyCallback CreateAfterCopyCallbackBeforeRotation(
       std::unique_ptr<ScreenRotationRequest> rotation_request) override;
   CopyCallback CreateAfterCopyCallbackAfterRotation(
       std::unique_ptr<ScreenRotationRequest> rotation_request) override;
 
   void IntersectBefore(CopyCallback next_callback,
                        std::unique_ptr<cc::CopyOutputResult> result);
   void IntersectAfter(CopyCallback next_callback,
                       std::unique_ptr<cc::CopyOutputResult> result);
 
   base::Closure intersect_before_callback_;
   base::Closure intersect_after_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScreenRotationAnimator);
 };
 
 TestScreenRotationAnimator::TestScreenRotationAnimator(
-    int64_t display_id,
+    aura::Window* root_window,
     const base::Closure& before_callback,
     const base::Closure& after_callback)
-    : ScreenRotationAnimator(display_id),
+    : ScreenRotationAnimator(root_window),
       intersect_before_callback_(before_callback),
       intersect_after_callback_(after_callback) {}
 
 ScreenRotationAnimator::CopyCallback
 TestScreenRotationAnimator::CreateAfterCopyCallbackBeforeRotation(
     std::unique_ptr<ScreenRotationRequest> rotation_request) {
   CopyCallback next_callback =
       ScreenRotationAnimator::CreateAfterCopyCallbackBeforeRotation(
           std::move(rotation_request));
   return base::Bind(&TestScreenRotationAnimator::IntersectBefore,
@@ skipping 56 matching lines @@
 void ScreenRotationAnimatorSlowAnimationTest::SetUp() {
   AshTestBase::SetUp();
 
   display_ = display::Screen::GetScreen()->GetPrimaryDisplay();
   if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
-  animator_ = base::MakeUnique<ScreenRotationAnimator>(display_.id());
+  animator_ =
+      base::MakeUnique<ScreenRotationAnimator>(GetRootWindow(display_.id()));
   test_api_ =
       base::MakeUnique<test::ScreenRotationAnimatorTestApi>(animator_.get());
   test_api()->DisableAnimationTimers();
   non_zero_duration_mode_ =
       base::MakeUnique<ui::ScopedAnimationDurationScaleMode>(
           ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
 }
 
 class ScreenRotationAnimatorSmoothAnimationTest : public test::AshTestBase {
  public:
   ScreenRotationAnimatorSmoothAnimationTest() {}
   ~ScreenRotationAnimatorSmoothAnimationTest() override {}
 
   // AshTestBase:
   void SetUp() override;
 
   void RemoveSecondaryDisplay(const std::string& specs);
   void QuitWaitForCopyCallback();
 
  protected:
   int64_t display_id() const { return display_.id(); }
 
   TestScreenRotationAnimator* animator() { return animator_.get(); }
 
-  void SetScreenRotationAnimator(int64_t display_id,
+  void SetScreenRotationAnimator(aura::Window* root_window,
                                  const base::Closure& before_callback,
                                  const base::Closure& after_callback);
 
   test::ScreenRotationAnimatorTestApi* test_api() { return test_api_.get(); }
 
   void WaitForCopyCallback();
 
   std::unique_ptr<base::RunLoop> run_loop_;
 
  private:
@@ skipping 26 matching lines @@
   ash_test_helper()->reset_commandline();
 
   display_ = display::Screen::GetScreen()->GetPrimaryDisplay();
   if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   run_loop_ = base::MakeUnique<base::RunLoop>();
-  SetScreenRotationAnimator(display_.id(), run_loop_->QuitWhenIdleClosure(),
+  SetScreenRotationAnimator(GetRootWindow(display_.id()),
+                            run_loop_->QuitWhenIdleClosure(),
                             run_loop_->QuitWhenIdleClosure());
   non_zero_duration_mode_ =
       base::MakeUnique<ui::ScopedAnimationDurationScaleMode>(
           ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
 }
 
 void ScreenRotationAnimatorSmoothAnimationTest::SetScreenRotationAnimator(
-    int64_t display_id,
+    aura::Window* root_window,
     const base::Closure& before_callback,
     const base::Closure& after_callback) {
   animator_ = base::MakeUnique<TestScreenRotationAnimator>(
-      display_id, before_callback, after_callback);
+      root_window, before_callback, after_callback);
   test_api_ =
       base::MakeUnique<test::ScreenRotationAnimatorTestApi>(animator_.get());
   test_api()->DisableAnimationTimers();
 }
 
 void ScreenRotationAnimatorSmoothAnimationTest::WaitForCopyCallback() {
   run_loop_.reset(new base::RunLoop());
   run_loop_->Run();
 }
 
 TEST_F(ScreenRotationAnimatorSlowAnimationTest, ShouldNotifyObserver) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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,
+  animator()->Rotate(display_id(), 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(ScreenRotationAnimatorSlowAnimationTest, ShouldNotifyObserverOnce) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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,
+  animator()->Rotate(display_id(), display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_FALSE(observer.notified());
 
-  animator()->Rotate(display::Display::ROTATE_180,
+  animator()->Rotate(display_id(), 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(ScreenRotationAnimatorSlowAnimationTest, RotatesToDifferentRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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,
+  animator()->Rotate(display_id(), 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(ScreenRotationAnimatorSlowAnimationTest,
        ShouldNotRotateTheSameRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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,
+  animator()->Rotate(display_id(), 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(ScreenRotationAnimatorSlowAnimationTest, RotatesDuringRotation) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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,
+  animator()->Rotate(display_id(), display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
-  animator()->Rotate(display::Display::ROTATE_180,
+  animator()->Rotate(display_id(), 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(ScreenRotationAnimatorSlowAnimationTest, ShouldCompleteAnimations) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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,
+  animator()->Rotate(display_id(), display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
-  animator()->Rotate(display::Display::ROTATE_180,
+  animator()->Rotate(display_id(), display::Display::ROTATE_180,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
-  animator()->Rotate(display::Display::ROTATE_270,
+  animator()->Rotate(display_id(), 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 that slow screen rotation animation will not interrupt hide animation.
 // The OverviewButton should be hidden.
@@ skipping 12 matching lines @@
   // Long duration for hide animation, to allow it to be interrupted.
   ui::ScopedAnimationDurationScaleMode hide_duration(
       ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
   GetTray()->SetVisible(false);
 
   // ScreenRotationAnimator copies the current layers, and deletes them upon
   // completion. Allow its animation to complete first.
   ui::ScopedAnimationDurationScaleMode rotate_duration(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   SetDisplayRotation(display_id(), display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  animator()->Rotate(display_id(), display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
 
   EXPECT_FALSE(GetTray()->visible());
 }
 
 // Test enable smooth screen rotation code path.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        RotatesToDifferentRotationWithCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
+  const int64_t display_id = display_manager()->GetDisplayAt(0).id();
   SetScreenRotationAnimator(
-      display_manager()->GetDisplayAt(0).id(), run_loop_->QuitWhenIdleClosure(),
+      GetRootWindow(display_id), run_loop_->QuitWhenIdleClosure(),
       base::Bind(
           &ScreenRotationAnimatorSmoothAnimationTest::QuitWaitForCopyCallback,
           base::Unretained(this)));
-  SetDisplayRotation(display_id(), display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  SetDisplayRotation(display_id, display::Display::ROTATE_0);
+  animator()->Rotate(display_id, display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
   EXPECT_TRUE(test_api()->HasActiveAnimations());
 
   test_api()->CompleteAnimations();
   EXPECT_FALSE(test_api()->HasActiveAnimations());
+  EXPECT_EQ(display::Display::ROTATE_90, GetDisplayRotation(display_id));
 }
 
-// If the external secondary display is removed before the first copy request
-// callback called, it should not crash.
+// If the rotating external secondary display is removed before the first copy
+// request callback called, it should stop rotating.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        RemoveExternalSecondaryDisplayBeforeFirstCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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();
+  const int64_t primary_display_id = display_manager()->GetDisplayAt(0).id();
+  const int64_t secondary_display_id = display_manager()->GetDisplayAt(1).id();
+
   SetScreenRotationAnimator(
-      display_manager()->GetDisplayAt(1).id(),
+      GetRootWindow(secondary_display_id),
       base::Bind(
           &ScreenRotationAnimatorSmoothAnimationTest::RemoveSecondaryDisplay,
           base::Unretained(this), "640x480"),
       run_loop_->QuitWhenIdleClosure());
-  SetDisplayRotation(display_manager()->GetDisplayAt(1).id(),
-                     display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  SetDisplayRotation(secondary_display_id, display::Display::ROTATE_0);
+  animator()->Rotate(secondary_display_id, 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());
 }
 
-// If the external primary display is removed before the first copy request
-// callback called, it should not crash.
+// If the rotating external primary display is removed before the first copy
+// request callback called, it should stop rotating.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        RemoveExternalPrimaryDisplayBeforeFirstCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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());
 
   Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId(
       display_manager()->GetDisplayAt(1).id());
-  const unsigned int secondary_display_id =
-      display_manager()->GetDisplayAt(0).id();
+  const int64_t primary_display_id = display_manager()->GetDisplayAt(1).id();
+  const int64_t secondary_display_id = display_manager()->GetDisplayAt(0).id();
   SetScreenRotationAnimator(
-      display_manager()->GetDisplayAt(1).id(),
+      GetRootWindow(primary_display_id),
       base::Bind(
           &ScreenRotationAnimatorSmoothAnimationTest::RemoveSecondaryDisplay,
           base::Unretained(this), "640x480"),
       run_loop_->QuitWhenIdleClosure());
-  SetDisplayRotation(display_manager()->GetDisplayAt(1).id(),
-                     display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  SetDisplayRotation(primary_display_id, display::Display::ROTATE_0);
+  animator()->Rotate(primary_display_id, display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ(secondary_display_id, display_manager()->GetDisplayAt(0).id());
 }
 
-// If the external secondary display is removed before the second copy request
-// callback called, it should not crash.
+// If the rotating external secondary display is removed before the second copy
+// request callback called, it should stop rotating.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        RemoveExternalSecondaryDisplayBeforeSecondCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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();
+  const int64_t primary_display_id = display_manager()->GetDisplayAt(0).id();
+  const int64_t secondary_display_id = display_manager()->GetDisplayAt(1).id();
   SetScreenRotationAnimator(
-      display_manager()->GetDisplayAt(1).id(), run_loop_->QuitWhenIdleClosure(),
+      GetRootWindow(secondary_display_id), run_loop_->QuitWhenIdleClosure(),
       base::Bind(
           &ScreenRotationAnimatorSmoothAnimationTest::RemoveSecondaryDisplay,
           base::Unretained(this), "640x480"));
-  SetDisplayRotation(display_manager()->GetDisplayAt(1).id(),
-                     display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  SetDisplayRotation(secondary_display_id, display::Display::ROTATE_0);
+  animator()->Rotate(secondary_display_id, 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());
 }
 
-// If the external primary display is removed before the second copy request
-// callback called, it should not crash.
+// If the rotating external primary display is removed before the second copy
+// request callback called, it should stop rotating.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        RemoveExternalPrimaryDisplayBeforeSecondCopyCallback) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   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());
 
   Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId(
       display_manager()->GetDisplayAt(1).id());
-  const unsigned int secondary_display_id =
-      display_manager()->GetDisplayAt(0).id();
+  const int64_t primary_display_id = display_manager()->GetDisplayAt(1).id();
+  const int64_t secondary_display_id = display_manager()->GetDisplayAt(0).id();
   SetScreenRotationAnimator(
-      display_manager()->GetDisplayAt(1).id(), run_loop_->QuitWhenIdleClosure(),
+      GetRootWindow(primary_display_id), run_loop_->QuitWhenIdleClosure(),
       base::Bind(
           &ScreenRotationAnimatorSmoothAnimationTest::RemoveSecondaryDisplay,
           base::Unretained(this), "640x480"));
-  SetDisplayRotation(display_manager()->GetDisplayAt(1).id(),
-                     display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  SetDisplayRotation(primary_display_id, display::Display::ROTATE_0);
+  animator()->Rotate(primary_display_id, display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ(secondary_display_id, display_manager()->GetDisplayAt(0).id());
 }
 
+// If the external primary display is removed while rotating the secondary
+// display. It should stop rotating the secondary display because the
+// |root_window| changed.
+TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
+       RemoveExternalPrimaryDisplayDuringAnimationChangedRootWindow) {
+  // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
+  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());
+
+  Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId(
+      display_manager()->GetDisplayAt(1).id());
+  const int64_t secondary_display_id = display_manager()->GetDisplayAt(0).id();
+  SetScreenRotationAnimator(
+      GetRootWindow(secondary_display_id),
+      base::Bind(
+          &ScreenRotationAnimatorSmoothAnimationTest::RemoveSecondaryDisplay,
+          base::Unretained(this), "640x480"),
+      run_loop_->QuitWhenIdleClosure());
+  SetDisplayRotation(secondary_display_id, display::Display::ROTATE_0);
+  animator()->Rotate(secondary_display_id, display::Display::ROTATE_90,
+                     display::Display::RotationSource::ROTATION_SOURCE_USER);
+  WaitForCopyCallback();
+  EXPECT_EQ(1U, display_manager()->GetNumDisplays());
+  EXPECT_EQ(secondary_display_id, display_manager()->GetDisplayAt(0).id());
+  EXPECT_EQ(display::Display::ROTATE_0,
+            GetDisplayRotation(secondary_display_id));
+}
+
 // Test that smooth screen rotation animation will not interrupt hide animation.
 // The OverviewButton should be hidden.
 TEST_F(ScreenRotationAnimatorSmoothAnimationTest,
        OverviewButtonTrayHideAnimationAlwaysCompletes) {
   // TODO(wutao): needs GetDisplayInfo http://crbug.com/622480.
   if (Shell::GetAshConfig() == Config::MASH) {
     ASSERT_TRUE(ShellPort::Get()->GetDisplayInfo(display_id()).id() !=
                 display_id());
     return;
   }
 
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
 
   // Long duration for hide animation, to allow it to be interrupted.
   ui::ScopedAnimationDurationScaleMode hide_duration(
       ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
   GetTray()->SetVisible(false);
 
   // Allow ScreenRotationAnimator animation to complete first.
   ui::ScopedAnimationDurationScaleMode rotate_duration(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
+  int64_t display_id = display_manager()->GetDisplayAt(0).id();
   SetScreenRotationAnimator(
-      display_manager()->GetDisplayAt(0).id(), run_loop_->QuitWhenIdleClosure(),
+      GetRootWindow(display_id), run_loop_->QuitWhenIdleClosure(),
       base::Bind(
           &ScreenRotationAnimatorSmoothAnimationTest::QuitWaitForCopyCallback,
           base::Unretained(this)));
-  SetDisplayRotation(display_id(), display::Display::ROTATE_0);
-  animator()->Rotate(display::Display::ROTATE_90,
+  SetDisplayRotation(display_id, display::Display::ROTATE_0);
+  animator()->Rotate(display_id, display::Display::ROTATE_90,
                      display::Display::RotationSource::ROTATION_SOURCE_USER);
   WaitForCopyCallback();
 
   GetTray()->layer()->GetAnimator()->StopAnimating();
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash