Rename of InkDropAnimationController classes to InkDrop.

ui/views/animation/test/ink_drop_impl_test_api.cc

Index: ui/views/animation/test/ink_drop_impl_test_api.cc
diff --git a/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc b/ui/views/animation/test/ink_drop_impl_test_api.cc
similarity index 52%
copy from ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc
copy to ui/views/animation/test/ink_drop_impl_test_api.cc
index 0964396b81a7a32c7950c0a626f650ef0b72a834..e0b15fbf9ca616a39d9be120bc03df870a7e48e3 100644
--- a/ui/views/animation/test/ink_drop_animation_controller_impl_test_api.cc
+++ b/ui/views/animation/test/ink_drop_impl_test_api.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/views/animation/test/ink_drop_animation_controller_impl_test_api.h"
+#include "ui/views/animation/test/ink_drop_impl_test_api.h"
 
-#include "ui/views/animation/ink_drop_animation_controller_impl.h"
 #include "ui/views/animation/ink_drop_hover.h"
+#include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_ripple.h"
 #include "ui/views/animation/test/ink_drop_hover_test_api.h"
 #include "ui/views/animation/test/ink_drop_ripple_test_api.h"
@@ -13,38 +13,34 @@
 namespace views {
 namespace test {
 
-InkDropAnimationControllerImplTestApi::InkDropAnimationControllerImplTestApi(
-    InkDropAnimationControllerImpl* ink_drop_controller)
-    : ui::test::MultiLayerAnimatorTestController(this),
-      ink_drop_controller_(ink_drop_controller) {}
+InkDropImplTestApi::InkDropImplTestApi(InkDropImpl* ink_drop)
+    : ui::test::MultiLayerAnimatorTestController(this), ink_drop_(ink_drop) {}
 
-InkDropAnimationControllerImplTestApi::
-    ~InkDropAnimationControllerImplTestApi() {}
+InkDropImplTestApi::~InkDropImplTestApi() {}
 
-const InkDropHover* InkDropAnimationControllerImplTestApi::hover() const {
-  return ink_drop_controller_->hover_.get();
+const InkDropHover* InkDropImplTestApi::hover() const {
+  return ink_drop_->hover_.get();
 }
 
-bool InkDropAnimationControllerImplTestApi::IsHoverFadingInOrVisible() const {
-  return ink_drop_controller_->IsHoverFadingInOrVisible();
+bool InkDropImplTestApi::IsHoverFadingInOrVisible() const {
+  return ink_drop_->IsHoverFadingInOrVisible();
 }
 
-std::vector<ui::LayerAnimator*>
-InkDropAnimationControllerImplTestApi::GetLayerAnimators() {
+std::vector<ui::LayerAnimator*> InkDropImplTestApi::GetLayerAnimators() {
   std::vector<ui::LayerAnimator*> animators;
 
-  if (ink_drop_controller_->hover_) {
+  if (ink_drop_->hover_) {
     InkDropHoverTestApi* ink_drop_hover_test_api =
-        ink_drop_controller_->hover_->GetTestApi();
+        ink_drop_->hover_->GetTestApi();
     std::vector<ui::LayerAnimator*> ink_drop_hover_animators =
         ink_drop_hover_test_api->GetLayerAnimators();
     animators.insert(animators.end(), ink_drop_hover_animators.begin(),
                      ink_drop_hover_animators.end());
   }
 
-  if (ink_drop_controller_->ink_drop_ripple_) {
+  if (ink_drop_->ink_drop_ripple_) {
     InkDropRippleTestApi* ink_drop_ripple_test_api =
-        ink_drop_controller_->ink_drop_ripple_->GetTestApi();
+        ink_drop_->ink_drop_ripple_->GetTestApi();
     std::vector<ui::LayerAnimator*> ink_drop_ripple_animators =
         ink_drop_ripple_test_api->GetLayerAnimators();
     animators.insert(animators.end(), ink_drop_ripple_animators.begin(),