Fix double ripple on activated flood fill ripple

ui/views/animation/ink_drop_ripple_unittest.cc

Index: ui/views/animation/ink_drop_ripple_unittest.cc
diff --git a/ui/views/animation/ink_drop_ripple_unittest.cc b/ui/views/animation/ink_drop_ripple_unittest.cc
index add5baf5dae7062f88589f384cdc5f34e0d14f49..1e243964791e2e22fdf8a31b670ed0868ce8117a 100644
--- a/ui/views/animation/ink_drop_ripple_unittest.cc
+++ b/ui/views/animation/ink_drop_ripple_unittest.cc
@@ -21,6 +21,19 @@
 
 namespace views {
 namespace test {
+namespace {
+
+std::string InkDropStatesToString(const std::vector<InkDropState>& states) {
+  std::string result;
+  for (size_t i = 0; i < states.size(); i++) {
+    if (i)
+      result += " ";
+    result += ToString(states[i]);
+  }
+  return result;
+}
+
+}
 
 const float kVisibleOpacity = 0.175f;
 
@@ -358,5 +371,19 @@ TEST_P(InkDropRippleTest, TargetInkDropStateOnAnimationEnded) {
             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(views::InkDropState::ACTION_PENDING);
+  ink_drop_ripple_->AnimateToState(views::InkDropState::ACTIVATED);
+  test_api_->CompleteAnimations();
+
+  EXPECT_EQ(
+      "ACTION_PENDING ACTIVATED",

[bruthig, 2017/01/10 17:08:03]

How come you are building concatenated strings here when elsewhere you use the
gmock ElementsAre matcher?
My preference is to use the ElementsAre matcher and if we want better log output
I think we can do this by adding a GTest printer for InkDropStates.  See
https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...

[mohsen, 2017/01/10 22:28:16]

Yeah, I also prefer gmock matchers, but gmock is forbidden in views at the
moment.

[bruthig, 2017/01/11 00:41:07]

Hmm that's unfortunate.  Is that documented somewhere or were you just told by
an OWNER?  I wonder if bringing this CL to the deciders attention would lend
weight to the argument at all...

[mohsen, 2017/01/11 15:59:44]

It is explicitly banned in ui/views/DEPS file (see https://crrev.com/107363004).
I also talked with sadrul@ and he confirmed that's still the case.

[bruthig, 2017/01/11 18:22:30]

Thx

+      InkDropStatesToString(observer_.GetAndResetAnimationStartedStates()));
+  EXPECT_EQ("ACTION_PENDING ACTIVATED",
+            InkDropStatesToString(observer_.GetAndResetAnimationEndedStates()));
+}
+
 }  // namespace test
 }  // namespace views