Revert 153291 - Fixes crash introduced @ 153047 (you can hit crash by maximizing a

ash/wm/window_animations_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 "ash/wm/window_animations.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/time.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation_container_element.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 
 using aura::Window;
 using ui::Layer;
 
 namespace ash {
 namespace internal {
 
-class WindowAnimationsTest : public ash::test::AshTestBase {
- public:
-  WindowAnimationsTest() {}
-
-  virtual void TearDown() OVERRIDE {
-    ui::LayerAnimator::set_disable_animations_for_test(true);
-    AshTestBase::TearDown();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
-};
+typedef ash::test::AshTestBase WindowAnimationsTest;
 
 TEST_F(WindowAnimationsTest, HideShow) {
   scoped_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithId(0, NULL));
   window->Show();
   EXPECT_TRUE(window->layer()->visible());
   // Hiding.
   SetWindowVisibilityAnimationType(
       window.get(),
       WINDOW_VISIBILITY_ANIMATION_TYPE_WORKSPACE_HIDE);
@@ skipping 100 matching lines @@
   // Layer target visibility changes according to Show/Hide.
   window->Show();
   EXPECT_TRUE(window->layer()->GetTargetVisibility());
   window->Hide();
   EXPECT_FALSE(window->layer()->GetTargetVisibility());
   window->Show();
   EXPECT_TRUE(window->layer()->GetTargetVisibility());
 }
 
 TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
-  ui::LayerAnimator::set_disable_animations_for_test(false);
+  internal::SetDelayedOldLayerDeletionInCrossFadeForTest(true);
 
   scoped_ptr<Window> window(
       aura::test::CreateTestWindowWithId(0, NULL));
   window->SetBounds(gfx::Rect(5, 10, 320, 240));
   window->Show();
 
   Layer* old_layer = window->layer();
   EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
 
   // Cross fade to a larger size, as in a maximize animation.
   CrossFadeToBounds(window.get(), gfx::Rect(0, 0, 640, 480));
   // Window's layer has been replaced.
   EXPECT_NE(old_layer, window->layer());
   // Original layer stays opaque and stretches to new size.
   EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
   EXPECT_EQ("5,10 320x240", old_layer->bounds().ToString());
   ui::Transform grow_transform;
   grow_transform.ConcatScale(640.f / 320.f, 480.f / 240.f);
   grow_transform.ConcatTranslate(-5.f, -10.f);
   EXPECT_EQ(grow_transform, old_layer->GetTargetTransform());
   // New layer animates in to the identity transform.
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(ui::Transform(), window->layer()->GetTargetTransform());
 
-  // Run the animations to completion.
-  old_layer->GetAnimator()->StopAnimating();
-  window->layer()->GetAnimator()->StopAnimating();
+  // Allow the animation observer to delete itself.
+  RunAllPendingInMessageLoop();
 
   // Cross fade to a smaller size, as in a restore animation.
   old_layer = window->layer();
   CrossFadeToBounds(window.get(), gfx::Rect(5, 10, 320, 240));
   // Again, window layer has been replaced.
   EXPECT_NE(old_layer, window->layer());
   // Original layer fades out and stretches down to new size.
   EXPECT_EQ(0.0f, old_layer->GetTargetOpacity());
   EXPECT_EQ("0,0 640x480", old_layer->bounds().ToString());
   ui::Transform shrink_transform;
   shrink_transform.ConcatScale(320.f / 640.f, 240.f / 480.f);
   shrink_transform.ConcatTranslate(5.f, 10.f);
   EXPECT_EQ(shrink_transform, old_layer->GetTargetTransform());
   // New layer animates in to the identity transform.
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(ui::Transform(), window->layer()->GetTargetTransform());
 
-  old_layer->GetAnimator()->StopAnimating();
-  window->layer()->GetAnimator()->StopAnimating();
+  RunAllPendingInMessageLoop();
+  internal::SetDelayedOldLayerDeletionInCrossFadeForTest(false);
 }
 
 TEST_F(WindowAnimationsTest, GetCrossFadeDuration) {
   gfx::Rect empty;
   gfx::Rect screen(0, 0, 1000, 500);
 
   // No change takes no time.
   EXPECT_EQ(0, GetCrossFadeDuration(empty, empty).InMilliseconds());
   EXPECT_EQ(0, GetCrossFadeDuration(screen, screen).InMilliseconds());
 
@@ skipping 16 matching lines @@
   // Medium changes take medium time.
   gfx::Rect half_screen(10, 10, 500, 250);
   EXPECT_EQ(kMinimum + kRange * 3 / 4,
             GetCrossFadeDuration(half_screen, screen).InMilliseconds());
   EXPECT_EQ(kMinimum + kRange * 3 / 4,
             GetCrossFadeDuration(screen, half_screen).InMilliseconds());
 }
 
 }  // namespace internal
 }  // namespace ash