1 files changed, 16 insertions, 16 deletions
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
index 8c00efb..a768930 100644
--- a/cc/test/animation_test_common.h
+++ b/cc/test/animation_test_common.h
@@ -11,13 +11,13 @@
 #include "IntSize.h"
 
 namespace cc {
-class LayerImpl;
-class Layer;
+class CCLayerImpl;
+class LayerChromium;
 }
 
 namespace WebKitTests {
 
-class FakeFloatAnimationCurve : public cc::FloatAnimationCurve {
+class FakeFloatAnimationCurve : public cc::CCFloatAnimationCurve {
 public:
     FakeFloatAnimationCurve();
     explicit FakeFloatAnimationCurve(double duration);
@@ -25,13 +25,13 @@ public:
 
     virtual double duration() const OVERRIDE;
     virtual float getValue(double now) const OVERRIDE;
-    virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE;
+    virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
 };
 
-class FakeTransformTransition : public cc::TransformAnimationCurve {
+class FakeTransformTransition : public cc::CCTransformAnimationCurve {
 public:
     FakeTransformTransition(double duration);
     virtual ~FakeTransformTransition();
@@ -39,13 +39,13 @@ public:
     virtual double duration() const OVERRIDE;
     virtual WebKit::WebTransformationMatrix getValue(double time) const OVERRIDE;
 
-    virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE;
+    virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
 };
 
-class FakeFloatTransition : public cc::FloatAnimationCurve {
+class FakeFloatTransition : public cc::CCFloatAnimationCurve {
 public:
     FakeFloatTransition(double duration, float from, float to);
     virtual ~FakeFloatTransition();
@@ -53,7 +53,7 @@ public:
     virtual double duration() const OVERRIDE;
     virtual float getValue(double time) const OVERRIDE;
 
-    virtual scoped_ptr<cc::AnimationCurve> clone() const OVERRIDE;
+    virtual scoped_ptr<cc::CCAnimationCurve> clone() const OVERRIDE;
 
 private:
     double m_duration;
@@ -61,12 +61,12 @@ private:
     float m_to;
 };
 
-class FakeLayerAnimationControllerClient : public cc::LayerAnimationControllerClient {
+class FakeLayerAnimationControllerClient : public cc::CCLayerAnimationControllerClient {
 public:
     FakeLayerAnimationControllerClient();
     virtual ~FakeLayerAnimationControllerClient();
 
-    // LayerAnimationControllerClient implementation
+    // CCLayerAnimationControllerClient implementation
     virtual int id() const OVERRIDE;
     virtual void setOpacityFromAnimation(float) OVERRIDE;
     virtual float opacity() const OVERRIDE;
@@ -78,14 +78,14 @@ private:
     WebKit::WebTransformationMatrix m_transform;
 };
 
-void addOpacityTransitionToController(cc::LayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-void addAnimatedTransformToController(cc::LayerAnimationController&, double duration, int deltaX, int deltaY);
+void addOpacityTransitionToController(cc::CCLayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addAnimatedTransformToController(cc::CCLayerAnimationController&, double duration, int deltaX, int deltaY);
 
-void addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
-void addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addOpacityTransitionToLayer(cc::LayerChromium&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
+void addOpacityTransitionToLayer(cc::CCLayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction);
 
-void addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int deltaY);
-void addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int deltaY);
+void addAnimatedTransformToLayer(cc::LayerChromium&, double duration, int deltaX, int deltaY);
+void addAnimatedTransformToLayer(cc::CCLayerImpl&, double duration, int deltaX, int deltaY);
 
 } // namespace WebKitTests