[ash-md] Fixed crash when DEACTIVATING a focused ink drop button.

ui/views/animation/ink_drop_impl.cc

 // Copyright 2015 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/views/animation/ink_drop_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/timer/timer.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/animation/ink_drop_highlight.h"
@@ skipping 297 matching lines @@
 
 void InkDropImpl::HideHighlightOnRippleHiddenState::OnFocusChanged() {
   if (GetInkDrop()->GetTargetInkDropState() != InkDropState::HIDDEN)
     return;
   NoAutoHighlightHiddenState::OnFocusChanged();
 }
 
 void InkDropImpl::HideHighlightOnRippleHiddenState::AnimationStarted(
     InkDropState ink_drop_state) {
   if (ink_drop_state == views::InkDropState::DEACTIVATED &&
-      GetInkDrop()->is_focused_) {
-    GetInkDrop()->ink_drop_ripple_->HideImmediately();
+      GetInkDrop()->ShouldHighlightBasedOnFocus()) {
+    // It's possible to get animation started events when destroying the
+    // |ink_drop_ripple_|.
+    // TODO(bruthig): Investigate if the animation framework can address this
+    // issue instead. See https://crbug.com/663335.
+    if (GetInkDrop()->ink_drop_ripple_)
+      GetInkDrop()->ink_drop_ripple_->HideImmediately();
     GetInkDrop()->SetHighlightState(
         state_factory()->CreateVisibleState(base::TimeDelta(), false));
   }
 }
 
 void InkDropImpl::HideHighlightOnRippleHiddenState::AnimationEnded(
     InkDropState ink_drop_state,
     InkDropAnimationEndedReason reason) {
   if (ink_drop_state == InkDropState::HIDDEN) {
     // Re-highlight, as necessary. For hover, there's a delay; for focus, jump
@@ skipping 434 matching lines @@
                                        "within a call to "
                                        "HighlightState::Exit().";
   if (highlight_state_) {
     base::AutoReset<bool> exit_guard(&exiting_highlight_state_, true);
     highlight_state_->Exit();
   }
   highlight_state_ = nullptr;
 }
 
 }  // namespace views