Fix double ripple on activated flood fill ripple

ui/views/animation/test/test_ink_drop_ripple_observer.h

Index: ui/views/animation/test/test_ink_drop_ripple_observer.h
diff --git a/ui/views/animation/test/test_ink_drop_ripple_observer.h b/ui/views/animation/test/test_ink_drop_ripple_observer.h
index 33d5f4abee2462cef0952083324ca975f9a225d6..2136c1e23cdd4b2d8432da9fd7fbe0662f4849c2 100644
--- a/ui/views/animation/test/test_ink_drop_ripple_observer.h
+++ b/ui/views/animation/test/test_ink_drop_ripple_observer.h
@@ -36,6 +36,9 @@ class TestInkDropRippleObserver
     return target_state_at_last_animation_ended_;
   }
 
+  std::vector<InkDropState> GetAndResetAnimationStartedStates();

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

nit: Can these be pushed up into TestInkDropAnimationObserverHelper?

nit: Can you add some docs too?

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

Done.

+  std::vector<InkDropState> GetAndResetAnimationEndedStates();
+
   // InkDropRippleObserver:
   void AnimationStarted(InkDropState ink_drop_state) override;
   void AnimationEnded(InkDropState ink_drop_state,
@@ -45,6 +48,12 @@ class TestInkDropRippleObserver
   // The type this inherits from. Reduces verbosity in .cc file.
   using ObserverHelper = TestInkDropAnimationObserverHelper<InkDropState>;
 
+  // List of states for which animation is started since last reset.
+  std::vector<InkDropState> animation_started_states_;
+
+  // List of states for which animation is ended since last reset.
+  std::vector<InkDropState> animation_ended_states_;
+
   // The value of InkDropRipple::GetTargetInkDropState() the last time an
   // AnimationStarted() event was handled. This is only valid if
   // |ink_drop_ripple_| is not null.