| Index: ash/wm/window_animations_unittest.cc
|
| diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
|
| index 91d7a7699a9da96b5cf1b1dc6e3ee38abd55aa41..7df1c4996d4f4f26d2e9589ee2266b9fbddb600b 100644
|
| --- a/ash/wm/window_animations_unittest.cc
|
| +++ b/ash/wm/window_animations_unittest.cc
|
| @@ -201,6 +201,8 @@ TEST_F(WindowAnimationsTest, LockAnimationDuration) {
|
|
|
| // Test that it is possible to lock transition duration
|
| {
|
| + // Update layer as minimizing will replace the window's layer.
|
| + layer = window->layer();
|
| ui::ScopedLayerAnimationSettings settings1(layer->GetAnimator());
|
| settings1.SetTransitionDuration(base::TimeDelta::FromMilliseconds(1000));
|
| // Duration is locked in outer scope.
|
| @@ -221,6 +223,7 @@ TEST_F(WindowAnimationsTest, LockAnimationDuration) {
|
|
|
| // Test that duration respects default.
|
| {
|
| + layer = window->layer();
|
| // Query default duration.
|
| MinimizeAnimationObserver observer(layer->GetAnimator());
|
| wm::GetWindowState(window.get())->Minimize();
|
| @@ -229,6 +232,7 @@ TEST_F(WindowAnimationsTest, LockAnimationDuration) {
|
| window->Show();
|
| layer->GetAnimator()->StopAnimating();
|
|
|
| + layer = window->layer();
|
| ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
|
| settings.LockTransitionDuration();
|
| // Setting transition duration is ignored since duration is locked
|
|
|