MD - add ripples to DL shelf items

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 112 matching lines @@
 
 TEST_P(InkDropAnimationTest, ActionPendingOpacity) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(InkDropAnimation::kVisibleOpacity, test_api_->GetCurrentOpacity());
 }
 
 TEST_P(InkDropAnimationTest, QuickActionOpacity) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
-  ink_drop_animation_->AnimateToState(views::InkDropState::QUICK_ACTION);
+  ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_TRIGGERED);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(InkDropAnimation::kHiddenOpacity, test_api_->GetCurrentOpacity());
 }
 
 TEST_P(InkDropAnimationTest, SlowActionPendingOpacity) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
-  ink_drop_animation_->AnimateToState(views::InkDropState::SLOW_ACTION_PENDING);
+  ink_drop_animation_->AnimateToState(
+      views::InkDropState::ALTERNATE_ACTION_PENDING);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(InkDropAnimation::kVisibleOpacity, test_api_->GetCurrentOpacity());
 }
 
 TEST_P(InkDropAnimationTest, SlowActionOpacity) {
   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);
+  ink_drop_animation_->AnimateToState(
+      views::InkDropState::ALTERNATE_ACTION_PENDING);
+  ink_drop_animation_->AnimateToState(
+      views::InkDropState::ALTERNATE_ACTION_TRIGGERED);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(InkDropAnimation::kHiddenOpacity, test_api_->GetCurrentOpacity());
 }
 
 TEST_P(InkDropAnimationTest, ActivatedOpacity) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTIVATED);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(InkDropAnimation::kVisibleOpacity, test_api_->GetCurrentOpacity());
@@ skipping 42 matching lines @@
   ink_drop_animation_->AnimateToState(InkDropState::ACTION_PENDING);
   test_api_->CompleteAnimations();
 
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::SUCCESS,
             observer_.last_animation_ended_reason());
 }
 
 TEST_P(InkDropAnimationTest, VerifyObserversAreNotifiedOfPreemptedAnimations) {
   ink_drop_animation_->AnimateToState(InkDropState::ACTION_PENDING);
-  ink_drop_animation_->AnimateToState(InkDropState::SLOW_ACTION_PENDING);
+  ink_drop_animation_->AnimateToState(InkDropState::ALTERNATE_ACTION_PENDING);
 
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(InkDropAnimationObserver::InkDropAnimationEndedReason::PRE_EMPTED,
             observer_.last_animation_ended_reason());
 }
 
 TEST_P(InkDropAnimationTest, InkDropStatesPersistWhenCallingAnimateToState) {
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTION_PENDING);
   ink_drop_animation_->AnimateToState(views::InkDropState::ACTIVATED);
   EXPECT_EQ(views::InkDropState::ACTIVATED,
@@ skipping 118 matching lines @@
 
   EXPECT_EQ(2, observer_.last_animation_ended_ordinal());
   EXPECT_EQ(views::InkDropState::HIDDEN,
             observer_.target_state_at_last_animation_ended());
 }
 
 }  // namespace test
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_UNITTEST_H_