Revert "Rename ActiveAnimation -> Animation"

TBR=vollick

BUG=none

Review URL: https://codereview.chromium.org/11642055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174296 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 13 deletions

diff --git a/cc/layer_tree_host_unittest_animation.cc b/cc/layer_tree_host_unittest_animation.cc
index 8d522ca..42d7f1d 100644
--- a/cc/layer_tree_host_unittest_animation.cc
+++ b/cc/layer_tree_host_unittest_animation.cc
@@ -248,8 +248,8 @@ public:
       bool hasUnfinishedAnimation) OVERRIDE {
     LayerAnimationController* controller =
         m_layerTreeHost->rootLayer()->layerAnimationController();
-    Animation* animation =
-        controller->getAnimation(0, Animation::Opacity);
+    ActiveAnimation* animation =
+        controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     if (!animation)
       return;
 
@@ -267,8 +267,8 @@ public:
 
     LayerAnimationController* controller_impl =
         host_impl->rootLayer()->layerAnimationController();
-    Animation* animation_impl =
-        controller_impl->getAnimation(0, Animation::Opacity);
+    ActiveAnimation* animation_impl =
+        controller_impl->getActiveAnimation(0, ActiveAnimation::Opacity);
 
     controller->removeAnimation(animation->id());
     controller_impl->removeAnimation(animation_impl->id());
@@ -298,8 +298,8 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes :
   virtual void notifyAnimationStarted(double time) OVERRIDE {
     LayerAnimationController* controller =
         m_layerTreeHost->rootLayer()->layerAnimationController();
-    Animation* animation =
-        controller->getAnimation(0, Animation::Opacity);
+    ActiveAnimation* animation =
+        controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     main_start_time_ = animation->startTime();
     controller->removeAnimation(animation->id());
 
@@ -313,8 +313,8 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes :
       bool hasUnfinishedAnimation) OVERRIDE {
     LayerAnimationController* controller =
         impl_host->rootLayer()->layerAnimationController();
-    Animation* animation =
-        controller->getAnimation(0, Animation::Opacity);
+    ActiveAnimation* animation =
+        controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     if (!animation)
       return;
 
@@ -349,8 +349,8 @@ class LayerTreeHostAnimationTestAnimationFinishedEvents :
   virtual void notifyAnimationFinished(double time) OVERRIDE {
     LayerAnimationController* controller =
         m_layerTreeHost->rootLayer()->layerAnimationController();
-    Animation* animation =
-        controller->getAnimation(0, Animation::Opacity);
+    ActiveAnimation* animation =
+        controller->getActiveAnimation(0, ActiveAnimation::Opacity);
     controller->removeAnimation(animation->id());
     endTest();
   }
@@ -419,9 +419,9 @@ class LayerTreeHostAnimationTestLayerAddedWithAnimation :
 
       // Any valid AnimationCurve will do here.
       scoped_ptr<AnimationCurve> curve(EaseTimingFunction::create());
-      scoped_ptr<Animation> animation(
-          Animation::create(curve.Pass(), 1, 1,
-                                  Animation::Opacity));
+      scoped_ptr<ActiveAnimation> animation(
+          ActiveAnimation::create(curve.Pass(), 1, 1,
+                                  ActiveAnimation::Opacity));
       layer->layerAnimationController()->addAnimation(animation.Pass());
 
       // We add the animation *before* attaching the layer to the tree.