Merge 198829 "Changes the order of widget Close() and DecrementD..."

ui/message_center/views/toast_contents_view.cc

Index: ui/message_center/views/toast_contents_view.cc
===================================================================
--- ui/message_center/views/toast_contents_view.cc	(revision 200012)
+++ ui/message_center/views/toast_contents_view.cc	(working copy)
@@ -214,11 +214,15 @@
 
 void ToastContentsView::OnBoundsAnimationEndedOrCancelled(
     const ui::Animation* animation) {
+  if (is_closing_ && closing_animation_ == animation && GetWidget())
+    GetWidget()->Close();
+
+  // This cannot be called before GetWidget()->Close(). Decrementing defer count
+  // will invoke update, which may invoke another close animation with
+  // incrementing defer counter. Close() after such process will cause a
+  // mismatch between increment/decrement. See crbug.com/238477
   if (collection_)
     collection_->DecrementDeferCounter();
-
-  if (is_closing_ && closing_animation_ == animation && GetWidget())
-    GetWidget()->Close();
 }
 
 // ui::AnimationDelegate