| Index: ui/views/animation/ink_drop_animation_unittest.cc
|
| diff --git a/ui/views/animation/ink_drop_animation_unittest.cc b/ui/views/animation/ink_drop_animation_unittest.cc
|
| index 91f8143416a80a857972acd1a1917719b6d7f0bd..d5b5902f22a79a168b093e3970d7ce2597295f71 100644
|
| --- a/ui/views/animation/ink_drop_animation_unittest.cc
|
| +++ b/ui/views/animation/ink_drop_animation_unittest.cc
|
| @@ -62,6 +62,7 @@ TEST_F(InkDropAnimationTest, AnimateToActionPending) {
|
|
|
| TEST_F(InkDropAnimationTest, AnimateToQuickAction) {
|
| scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
|
| + ink_drop_animation->AnimateToState(views::InkDropState::ACTION_PENDING);
|
| ink_drop_animation->AnimateToState(views::InkDropState::QUICK_ACTION);
|
| EXPECT_EQ(views::InkDropState::QUICK_ACTION,
|
| ink_drop_animation->ink_drop_state());
|
| @@ -69,6 +70,7 @@ TEST_F(InkDropAnimationTest, AnimateToQuickAction) {
|
|
|
| TEST_F(InkDropAnimationTest, AnimateToSlowActionPending) {
|
| scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
|
| + ink_drop_animation->AnimateToState(views::InkDropState::ACTION_PENDING);
|
| ink_drop_animation->AnimateToState(views::InkDropState::SLOW_ACTION_PENDING);
|
| EXPECT_EQ(views::InkDropState::SLOW_ACTION_PENDING,
|
| ink_drop_animation->ink_drop_state());
|
| @@ -76,6 +78,8 @@ TEST_F(InkDropAnimationTest, AnimateToSlowActionPending) {
|
|
|
| TEST_F(InkDropAnimationTest, AnimateToSlowAction) {
|
| scoped_ptr<InkDropAnimation> ink_drop_animation = CreateInkDropAnimation();
|
| + ink_drop_animation->AnimateToState(views::InkDropState::ACTION_PENDING);
|
| + ink_drop_animation->AnimateToState(views::InkDropState::SLOW_ACTION_PENDING);
|
| ink_drop_animation->AnimateToState(views::InkDropState::SLOW_ACTION);
|
| EXPECT_EQ(views::InkDropState::SLOW_ACTION,
|
| ink_drop_animation->ink_drop_state());
|
|
|