Index: cc/test/animation_test_common.h |
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h |
index 6ee0cdd87ddb4c4b90239e178af29f8ce533fa1b..9cb1775405f70d87c44554c8e31c0d97ce613dc0 100644 |
--- a/cc/test/animation_test_common.h |
+++ b/cc/test/animation_test_common.h |
@@ -60,17 +60,17 @@ private: |
float m_to; |
}; |
-class FakeLayerAnimationControllerClient : public cc::LayerAnimationControllerClient { |
+class FakeLayerAnimationControllerObserver : public cc::LayerAnimationControllerObserver { |
public: |
- FakeLayerAnimationControllerClient(); |
- virtual ~FakeLayerAnimationControllerClient(); |
- |
- // LayerAnimationControllerClient implementation |
- virtual int id() const OVERRIDE; |
- virtual void setOpacityFromAnimation(float) OVERRIDE; |
- virtual float opacity() const OVERRIDE; |
- virtual void setTransformFromAnimation(const gfx::Transform&) OVERRIDE; |
- virtual const gfx::Transform& transform() const OVERRIDE; |
+ FakeLayerAnimationControllerObserver(); |
+ virtual ~FakeLayerAnimationControllerObserver(); |
+ |
+ // LayerAnimationControllerObserver implementation |
+ virtual void OnOpacityAnimated(float) OVERRIDE; |
+ virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE; |
+ |
+ float opacity() const { return m_opacity; } |
+ const gfx::Transform& transform() const { return m_transform; } |
private: |
float m_opacity; |