[Merge to M51] Fix the issue that Apps window keeps moving down to the right when reopened.

ui/wm/core/visibility_controller_unittest.cc

 // Copyright (c) 2012 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 "ui/wm/core/visibility_controller.h"
 
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
@@ skipping 36 matching lines @@
       IsAnimatingProperty(ui::LayerAnimationElement::OPACITY));
   EXPECT_EQ(0.0f, window->layer()->GetTargetOpacity());
 
   // Check that the visibility is correct after the hide animation has finished.
   window->Hide();
   window->layer()->GetAnimator()->StopAnimating();
   EXPECT_FALSE(window->layer()->visible());
   EXPECT_FALSE(window->IsVisible());
 }
 
+// Check that a hiding animation would not change a window's bounds in screen.
+TEST_F(VisibilityControllerTest, HideAnimationWindowBoundsTest) {
+  // We cannot disable animations for this test.
+  ui::ScopedAnimationDurationScaleMode test_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+
+  VisibilityController controller;
+  aura::client::SetVisibilityClient(root_window(), &controller);
+
+  // Set bound expectation.
+  gfx::Rect expected_bounds(4, 5, 123, 245);
+  aura::test::TestWindowDelegate d;
+  std::unique_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
+      &d, -2, expected_bounds, root_window()));
+  window->Show();
+  SetWindowVisibilityChangesAnimated(window.get());
+  SetWindowVisibilityAnimationDuration(window.get(),
+                                       base::TimeDelta::FromMilliseconds(5));
+  SetWindowVisibilityAnimationType(window.get(),
+                                   WINDOW_VISIBILITY_ANIMATION_TYPE_DROP);
+  // Check that the bound is correct after the hide animation has finished.
+  window->Hide();
+  window->layer()->GetAnimator()->StopAnimating();
+  EXPECT_EQ(expected_bounds, window->GetBoundsInScreen());
+}
+
 // Test if SetWindowVisibilityChagngesAnimated will animate the specified
 // window.
 TEST_F(VisibilityControllerTest, SetWindowVisibilityChagnesAnimated) {
   // We cannot disable animations for this test.
   ui::ScopedAnimationDurationScaleMode test_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
 
   VisibilityController controller;
   aura::client::SetVisibilityClient(root_window(), &controller);
 
@@ skipping 14 matching lines @@
   EXPECT_TRUE(window->layer()->GetAnimator()->is_animating());
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(0.0f, window->layer()->opacity());
 
   window->layer()->GetAnimator()->StopAnimating();
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window->layer()->opacity());
 }
 
 }  // namespace wm