Prevent ~StickyKeysOverlay() from calling back into StickyKeysOverlay via the animator.

ash/sticky_keys/sticky_keys_overlay.cc

 // Copyright 2014 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/sticky_keys/sticky_keys_overlay.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "base/strings/string_util.h"
@@ skipping 213 matching lines @@
   params.bounds = CalculateOverlayBounds();
   params.parent = Shell::GetContainer(Shell::GetTargetRootWindow(),
                                       kShellWindowId_OverlayContainer);
   overlay_widget_.reset(new views::Widget);
   overlay_widget_->Init(params);
   overlay_widget_->SetVisibilityChangedAnimationsEnabled(false);
   overlay_widget_->SetContentsView(overlay_view_.get());
   overlay_widget_->GetNativeView()->SetName("StickyKeysOverlay");
 }
 
-StickyKeysOverlay::~StickyKeysOverlay() {}
+StickyKeysOverlay::~StickyKeysOverlay() {
+  // Remove ourself from the animator to avoid being re-entrantly called in
+  // |overlay_widget_|'s destructor.
+  ui::Layer* layer = overlay_widget_->GetLayer();
+  if (layer) {
+    ui::LayerAnimator* animator = layer->GetAnimator();
+    if (animator)
+      animator->RemoveObserver(this);
+  }
+}
 
 void StickyKeysOverlay::Show(bool visible) {
   if (is_visible_ == visible)
     return;
 
   is_visible_ = visible;
   if (is_visible_)
     overlay_widget_->Show();
   overlay_widget_->SetBounds(CalculateOverlayBounds());
 
@@ skipping 62 matching lines @@
   ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();
   if (animator)
     animator->RemoveObserver(this);
 }
 
 void StickyKeysOverlay::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {
 }
 
 }  // namespace ash