| Index: cc/CCActiveAnimation.h | 
| diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h | 
| index 213b510fceed685a5221bd225ea90bfa65cfc3e7..b8d3607d9b1e7d942c6c53831e01733c363e6d8a 100644 | 
| --- a/cc/CCActiveAnimation.h | 
| +++ b/cc/CCActiveAnimation.h | 
| @@ -6,8 +6,7 @@ | 
| #define CCActiveAnimation_h | 
|  | 
| #include "base/basictypes.h" | 
| -#include <wtf/OwnPtr.h> | 
| -#include <wtf/PassOwnPtr.h> | 
| +#include "base/memory/scoped_ptr.h" | 
|  | 
| namespace cc { | 
|  | 
| @@ -47,7 +46,7 @@ public: | 
| TargetPropertyEnumSize | 
| }; | 
|  | 
| -    static PassOwnPtr<CCActiveAnimation> create(PassOwnPtr<CCAnimationCurve>, int animationId, int groupId, TargetProperty); | 
| +    static scoped_ptr<CCActiveAnimation> create(scoped_ptr<CCAnimationCurve>, int animationId, int groupId, TargetProperty); | 
|  | 
| virtual ~CCActiveAnimation(); | 
|  | 
| @@ -100,16 +99,16 @@ public: | 
| NonControllingInstance | 
| }; | 
|  | 
| -    PassOwnPtr<CCActiveAnimation> clone(InstanceType) const; | 
| -    PassOwnPtr<CCActiveAnimation> cloneAndInitialize(InstanceType, RunState initialRunState, double startTime) const; | 
| +    scoped_ptr<CCActiveAnimation> clone(InstanceType) const; | 
| +    scoped_ptr<CCActiveAnimation> cloneAndInitialize(InstanceType, RunState initialRunState, double startTime) const; | 
| bool isControllingInstance() const { return m_isControllingInstance; } | 
|  | 
| void pushPropertiesTo(CCActiveAnimation*) const; | 
|  | 
| private: | 
| -    CCActiveAnimation(PassOwnPtr<CCAnimationCurve>, int animationId, int groupId, TargetProperty); | 
| +    CCActiveAnimation(scoped_ptr<CCAnimationCurve>, int animationId, int groupId, TargetProperty); | 
|  | 
| -    OwnPtr<CCAnimationCurve> m_curve; | 
| +    scoped_ptr<CCAnimationCurve> m_curve; | 
|  | 
| // IDs are not necessarily unique. | 
| int m_id; | 
|  |