Index: cc/test/animation_test_common.h |
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h |
index 2d47e6d15279dab981a9bc6da9a02f9bae1bc26f..b63010e1e9754db0e86cf9c810b7999f30114966 100644 |
--- a/cc/test/animation_test_common.h |
+++ b/cc/test/animation_test_common.h |
@@ -31,7 +31,7 @@ class FakeFloatAnimationCurve : public FloatAnimationCurve { |
base::TimeDelta Duration() const override; |
float GetValue(base::TimeDelta now) const override; |
- scoped_ptr<AnimationCurve> Clone() const override; |
+ std::unique_ptr<AnimationCurve> Clone() const override; |
private: |
base::TimeDelta duration_; |
@@ -54,7 +54,7 @@ class FakeTransformTransition : public TransformAnimationCurve { |
bool MaximumTargetScale(bool forward_direction, |
float* max_scale) const override; |
- scoped_ptr<AnimationCurve> Clone() const override; |
+ std::unique_ptr<AnimationCurve> Clone() const override; |
private: |
base::TimeDelta duration_; |
@@ -68,7 +68,7 @@ class FakeFloatTransition : public FloatAnimationCurve { |
base::TimeDelta Duration() const override; |
float GetValue(base::TimeDelta time) const override; |
- scoped_ptr<AnimationCurve> Clone() const override; |
+ std::unique_ptr<AnimationCurve> Clone() const override; |
private: |
base::TimeDelta duration_; |
@@ -173,11 +173,11 @@ int AddOpacityStepsToController(LayerAnimationController* target, |
void AddAnimationToLayerWithPlayer(int layer_id, |
scoped_refptr<AnimationTimeline> timeline, |
- scoped_ptr<Animation> animation); |
+ std::unique_ptr<Animation> animation); |
void AddAnimationToLayerWithExistingPlayer( |
int layer_id, |
scoped_refptr<AnimationTimeline> timeline, |
- scoped_ptr<Animation> animation); |
+ std::unique_ptr<Animation> animation); |
void RemoveAnimationFromLayerWithExistingPlayer( |
int layer_id, |