Prevent hiding a toast during animation

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 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/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ skipping 104 matching lines @@
   ui::ScopedAnimationDurationScaleMode slow_animation_duration(
       ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_TRUE(GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1, GetToastSerial());
   EXPECT_TRUE(GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating());
 
-  // Close it during animation.
+  // Try to close it during animation.
   ClickDismissButton();
 
-  while (GetCurrentOverlay() != nullptr)
+  while (GetCurrentWidget()->GetLayer()->GetAnimator()->is_animating())
     base::RunLoop().RunUntilIdle();
+
+  // Toast isn't closed.
+  EXPECT_TRUE(GetCurrentOverlay() != nullptr);
 }
 
 TEST_F(ToastManagerTest, QueueMessage) {
   ShowToast("DUMMY1", 10);
   ShowToast("DUMMY2", 10);
   ShowToast("DUMMY3", 10);
 
   EXPECT_EQ(1, GetToastSerial());
   EXPECT_EQ("DUMMY1", GetCurrentText());
 
@@ skipping 151 matching lines @@
   EXPECT_EQ("TEXT3", GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id3);
   // Confirm that the shown toast disappears.
   EXPECT_FALSE(GetCurrentOverlay());
   // Confirm that only 1 toast is shown.
   EXPECT_EQ(2, GetToastSerial());
 }
 
 }  // namespace ash