Rename ActiveAnimation -> Animation

cc/layer.cc

Index: cc/layer.cc
diff --git a/cc/layer.cc b/cc/layer.cc
index 73a7711393f3c6611bd040394409ec773482ddf5..f34c4ae93b241eca5c0773b0e34d15810a9d9b4b 100644
--- a/cc/layer.cc
+++ b/cc/layer.cc
@@ -4,7 +4,7 @@
 
 #include "cc/layer.h"
 
-#include "cc/active_animation.h"
+#include "cc/animation.h"
 #include "cc/animation_events.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ -386,7 +386,7 @@ float Layer::opacity() const
 
 bool Layer::opacityIsAnimating() const
 {
-    return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Opacity);
+    return m_layerAnimationController->isAnimatingProperty(Animation::Opacity);
 }
 
 void Layer::setContentsOpaque(bool opaque)
@@ -428,7 +428,7 @@ const gfx::Transform& Layer::transform() const
 
 bool Layer::transformIsAnimating() const
 {
-    return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Transform);
+    return m_layerAnimationController->isAnimatingProperty(Animation::Transform);
 }
 
 void Layer::setScrollOffset(gfx::Vector2d scrollOffset)
@@ -748,7 +748,7 @@ void Layer::OnTransformAnimated(const gfx::Transform& transform)
     m_transform = transform;
 }
 
-bool Layer::addAnimation(scoped_ptr <ActiveAnimation> animation)
+bool Layer::addAnimation(scoped_ptr <Animation> animation)
 {
     // WebCore currently assumes that accelerated animations will start soon
     // after the animation is added. However we cannot guarantee that if we do