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

ash/wm/window_animations.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 <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 32 matching lines @@
 
 using aura::Window;
 using base::TimeDelta;
 using ui::Layer;
 
 namespace ash {
 namespace internal {
 namespace {
 const float kWindowAnimation_Vertical_TranslateY = 15.f;
 
+bool delayed_old_layer_deletion_in_cross_fade_for_test_ = false;
 }
 
 DEFINE_WINDOW_PROPERTY_KEY(WindowVisibilityAnimationType,
                            kWindowVisibilityAnimationTypeKey,
                            WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT);
 DEFINE_WINDOW_PROPERTY_KEY(int, kWindowVisibilityAnimationDurationKey, 0);
 DEFINE_WINDOW_PROPERTY_KEY(WindowVisibilityAnimationTransition,
                            kWindowVisibilityAnimationTransitionKey,
                            ANIMATE_BOTH);
 DEFINE_WINDOW_PROPERTY_KEY(float,
@@ skipping 593 matching lines @@
   // aura::WindowObserver overrides:
   virtual void OnWindowDestroying(Window* window) OVERRIDE {
     if (layer_)
       layer_->GetAnimator()->StopAnimating();
     // Delete is scheduled in OnImplicitAnimationsCompleted().
     Cleanup();
   }
 
   // ui::ImplicitAnimationObserver overrides:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE {
-    delete this;
+    // ImplicitAnimationObserver's base class uses the object after
+    // calling this function, so we cannot delete |this|. The |layer_|
+    // may be gone by the next message loop run when shutting down, so
+    // clean them up now.
+    if (!delayed_old_layer_deletion_in_cross_fade_for_test_)
+      Cleanup();
+    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
 
  private:
   // Can be called multiple times if the window is closed or the compositor
   // fails in the middle of the animation.
   void Cleanup() {
     if (window_) {
       window_->RemoveObserver(this);
       window_ = NULL;
     }
@@ skipping 291 matching lines @@
   }
   if (visible) {
     return AnimateShowWindow(window);
   } else {
     // Don't start hiding the window again if it's already being hidden.
     return window->layer()->GetTargetOpacity() != 0.0f &&
         AnimateHideWindow(window);
   }
 }
 
+void SetDelayedOldLayerDeletionInCrossFadeForTest(bool value) {
+  delayed_old_layer_deletion_in_cross_fade_for_test_ = value;
+}
+
 }  // namespace internal
 }  // namespace ash