Rename ActiveAnimation -> Animation

cc/test/animation_test_common.cc

Index: cc/test/animation_test_common.cc
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 258a266d25eae055f355a080a3ab768fd8bfd76b..8f0dfe285cb5f8cb5af450fa655c5fc1e70eb0c3 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -10,7 +10,7 @@
 #include "cc/layer_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h"
 
-using cc::ActiveAnimation;
+using cc::Animation;
 using cc::AnimationCurve;
 using cc::EaseTimingFunction;
 using cc::FloatKeyframe;
@@ -37,7 +37,7 @@ int addOpacityTransition(Target& target, double duration, float startOpacity, fl
 
     int id = nextAnimationId++;
 
-    scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<AnimationCurve>(), id, 0, ActiveAnimation::Opacity));
+    scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), id, 0, Animation::Opacity));
     animation->setNeedsSynchronizedStartTime(true);
 
     target.addAnimation(animation.Pass());
@@ -61,7 +61,7 @@ int addAnimatedTransform(Target& target, double duration, int deltaX, int deltaY
 
     int id = nextAnimationId++;
 
-    scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<AnimationCurve>(), id, 0, ActiveAnimation::Transform));
+    scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), id, 0, Animation::Transform));
     animation->setNeedsSynchronizedStartTime(true);
 
     target.addAnimation(animation.Pass());