| Index: ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
|
| diff --git a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
|
| index 5991eb077b462d1e3a11057e17b1c508ac524ca6..2d430edcaeb98a023e20de69088e2be5f306bfe6 100644
|
| --- a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
|
| +++ b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
|
| @@ -110,7 +110,8 @@ TEST_P(InkDropAnimationControllerFactoryTest, StateIsHiddenInitially) {
|
|
|
| TEST_P(InkDropAnimationControllerFactoryTest, TypicalQuickAction) {
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);
|
| - ink_drop_animation_controller_->AnimateToState(InkDropState::QUICK_ACTION);
|
| + ink_drop_animation_controller_->AnimateToState(
|
| + InkDropState::ACTION_TRIGGERED);
|
| EXPECT_EQ(InkDropState::HIDDEN,
|
| ink_drop_animation_controller_->GetTargetInkDropState());
|
| }
|
| @@ -125,8 +126,9 @@ TEST_P(InkDropAnimationControllerFactoryTest, CancelQuickAction) {
|
| TEST_P(InkDropAnimationControllerFactoryTest, TypicalSlowAction) {
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);
|
| ink_drop_animation_controller_->AnimateToState(
|
| - InkDropState::SLOW_ACTION_PENDING);
|
| - ink_drop_animation_controller_->AnimateToState(InkDropState::SLOW_ACTION);
|
| + InkDropState::ALTERNATE_ACTION_PENDING);
|
| + ink_drop_animation_controller_->AnimateToState(
|
| + InkDropState::ALTERNATE_ACTION_TRIGGERED);
|
| EXPECT_EQ(InkDropState::HIDDEN,
|
| ink_drop_animation_controller_->GetTargetInkDropState());
|
| }
|
| @@ -134,7 +136,7 @@ TEST_P(InkDropAnimationControllerFactoryTest, TypicalSlowAction) {
|
| TEST_P(InkDropAnimationControllerFactoryTest, CancelSlowAction) {
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);
|
| ink_drop_animation_controller_->AnimateToState(
|
| - InkDropState::SLOW_ACTION_PENDING);
|
| + InkDropState::ALTERNATE_ACTION_PENDING);
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::HIDDEN);
|
| EXPECT_EQ(InkDropState::HIDDEN,
|
| ink_drop_animation_controller_->GetTargetInkDropState());
|
| @@ -151,7 +153,7 @@ TEST_P(InkDropAnimationControllerFactoryTest, TypicalQuickActivated) {
|
| TEST_P(InkDropAnimationControllerFactoryTest, TypicalSlowActivated) {
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);
|
| ink_drop_animation_controller_->AnimateToState(
|
| - InkDropState::SLOW_ACTION_PENDING);
|
| + InkDropState::ALTERNATE_ACTION_PENDING);
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::ACTIVATED);
|
| ink_drop_animation_controller_->AnimateToState(InkDropState::DEACTIVATED);
|
| EXPECT_EQ(InkDropState::HIDDEN,
|
|
|