Fix double ripple on activated flood fill ripple

ui/views/animation/ink_drop_ripple_unittest.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_ripple.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 340 matching lines @@
 
   ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN);
 
   test_api_->CompleteAnimations();
 
   EXPECT_TRUE(observer_.AnimationHasEnded());
   EXPECT_EQ(views::InkDropState::HIDDEN,
             observer_.target_state_at_last_animation_ended());
 }
 
+// Verifies that when an we ink drop transitions from ACTION_PENDING to
+// ACTIVATED state, animation observers are called in order.
+TEST_P(InkDropRippleTest, RipplePendingToActivatedObserverOrder) {
+  ink_drop_ripple_->AnimateToState(InkDropState::ACTION_PENDING);
+  ink_drop_ripple_->AnimateToState(InkDropState::ACTIVATED);
+  test_api_->CompleteAnimations();
+
+  EXPECT_TRUE(observer_.AnimationStartedContextsMatch(
+      {InkDropState::ACTION_PENDING, InkDropState::ACTIVATED}));
+  EXPECT_TRUE(observer_.AnimationEndedContextsMatch(
+      {InkDropState::ACTION_PENDING, InkDropState::ACTIVATED}));
+}
+
 }  // namespace test
 }  // namespace views