Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed.

ui/views/animation/ink_drop_animation_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.
 
 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 45 matching lines @@
 TEST_F(InkDropAnimationTest, AnimateToActionPending) {
   scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
   ink_drop_animation->AnimateToState(views::InkDropState::ACTION_PENDING);
   EXPECT_EQ(views::InkDropState::ACTION_PENDING,
             ink_drop_animation->ink_drop_state());
 }
 
 TEST_F(InkDropAnimationTest, AnimateToQuickAction) {
   scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
   ink_drop_animation->AnimateToState(views::InkDropState::QUICK_ACTION);
-  EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop_animation->ink_drop_state());
+  EXPECT_EQ(views::InkDropState::QUICK_ACTION,
+            ink_drop_animation->ink_drop_state());
 }
 
 TEST_F(InkDropAnimationTest, AnimateToSlowActionPending) {
   scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
   ink_drop_animation->AnimateToState(views::InkDropState::SLOW_ACTION_PENDING);
   EXPECT_EQ(views::InkDropState::SLOW_ACTION_PENDING,
             ink_drop_animation->ink_drop_state());
 }
 
 TEST_F(InkDropAnimationTest, AnimateToSlowAction) {
   scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
   ink_drop_animation->AnimateToState(views::InkDropState::SLOW_ACTION);
-  EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop_animation->ink_drop_state());
+  EXPECT_EQ(views::InkDropState::SLOW_ACTION,
+            ink_drop_animation->ink_drop_state());
 }
 
 TEST_F(InkDropAnimationTest, AnimateToActivated) {
   scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
   ink_drop_animation->AnimateToState(views::InkDropState::ACTIVATED);
   EXPECT_EQ(views::InkDropState::ACTIVATED,
             ink_drop_animation->ink_drop_state());
 }
 
 TEST_F(InkDropAnimationTest, AnimateToDeactivated) {
   scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
   ink_drop_animation->AnimateToState(views::InkDropState::DEACTIVATED);
-  EXPECT_EQ(views::InkDropState::HIDDEN, ink_drop_animation->ink_drop_state());
+  EXPECT_EQ(views::InkDropState::DEACTIVATED,
+            ink_drop_animation->ink_drop_state());
 }
 
 TEST_F(InkDropAnimationTest,
        TransformedPointsUsingTransformsFromCalculateCircleTransforms) {
   const int kHalfDrawnSize = 5;
   const int kDrawnSize = 2 * kHalfDrawnSize;
 
   const int kHalfTransformedSize = 100;
   const int kTransformedSize = 2 * kHalfTransformedSize;
 
@@ skipping 189 matching lines @@
   EXPECT_EQ(gfx::Point(0, -kHalfTransformedHeight),
             TransformPoint(kVerticalTransform, top_mid));
   EXPECT_EQ(gfx::Point(0, kHalfTransformedHeight),
             TransformPoint(kVerticalTransform, bottom_mid));
 }
 
 }  // namespace test
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_