| Index: cc/animation/scroll_offset_animation_curve_unittest.cc
|
| diff --git a/cc/animation/scroll_offset_animation_curve_unittest.cc b/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| index 1f6e62a2bf3d98b1584bb6bfcf134b91808e1018..f8f95844d81997ae7f4e43a7c440663250e828fb 100644
|
| --- a/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| +++ b/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| @@ -17,7 +17,7 @@ namespace {
|
|
|
| TEST(ScrollOffsetAnimationCurveTest, DeltaBasedDuration) {
|
| gfx::ScrollOffset target_value(100.f, 200.f);
|
| - scoped_ptr<ScrollOffsetAnimationCurve> curve(
|
| + std::unique_ptr<ScrollOffsetAnimationCurve> curve(
|
| ScrollOffsetAnimationCurve::Create(target_value,
|
| EaseInOutTimingFunction::Create()));
|
|
|
| @@ -60,7 +60,7 @@ TEST(ScrollOffsetAnimationCurveTest, DeltaBasedDuration) {
|
| TEST(ScrollOffsetAnimationCurveTest, GetValue) {
|
| gfx::ScrollOffset initial_value(2.f, 40.f);
|
| gfx::ScrollOffset target_value(10.f, 20.f);
|
| - scoped_ptr<ScrollOffsetAnimationCurve> curve(
|
| + std::unique_ptr<ScrollOffsetAnimationCurve> curve(
|
| ScrollOffsetAnimationCurve::Create(target_value,
|
| EaseInOutTimingFunction::Create()));
|
| curve->SetInitialValue(initial_value);
|
| @@ -93,13 +93,13 @@ TEST(ScrollOffsetAnimationCurveTest, GetValue) {
|
| TEST(ScrollOffsetAnimationCurveTest, Clone) {
|
| gfx::ScrollOffset initial_value(2.f, 40.f);
|
| gfx::ScrollOffset target_value(10.f, 20.f);
|
| - scoped_ptr<ScrollOffsetAnimationCurve> curve(
|
| + std::unique_ptr<ScrollOffsetAnimationCurve> curve(
|
| ScrollOffsetAnimationCurve::Create(target_value,
|
| EaseInOutTimingFunction::Create()));
|
| curve->SetInitialValue(initial_value);
|
| base::TimeDelta duration = curve->Duration();
|
|
|
| - scoped_ptr<AnimationCurve> clone(curve->Clone());
|
| + std::unique_ptr<AnimationCurve> clone(curve->Clone());
|
|
|
| EXPECT_EQ(AnimationCurve::SCROLL_OFFSET, clone->Type());
|
| EXPECT_EQ(duration, clone->Duration());
|
| @@ -131,7 +131,7 @@ TEST(ScrollOffsetAnimationCurveTest, UpdateTarget) {
|
| gfx::ScrollOffset initial_value(0.f, 0.f);
|
| gfx::ScrollOffset target_value(0.f, 3600.f);
|
| double duration = kConstantDuration / kDurationDivisor;
|
| - scoped_ptr<ScrollOffsetAnimationCurve> curve(
|
| + std::unique_ptr<ScrollOffsetAnimationCurve> curve(
|
| ScrollOffsetAnimationCurve::Create(
|
| target_value, EaseInOutTimingFunction::Create(),
|
| ScrollOffsetAnimationCurve::DurationBehavior::CONSTANT));
|
| @@ -174,7 +174,7 @@ TEST(ScrollOffsetAnimationCurveTest, UpdateTarget) {
|
| }
|
|
|
| TEST(ScrollOffsetAnimationCurveTest, InverseDeltaDuration) {
|
| - scoped_ptr<ScrollOffsetAnimationCurve> curve(
|
| + std::unique_ptr<ScrollOffsetAnimationCurve> curve(
|
| ScrollOffsetAnimationCurve::Create(
|
| gfx::ScrollOffset(0.f, 100.f), EaseInOutTimingFunction::Create(),
|
| ScrollOffsetAnimationCurve::DurationBehavior::INVERSE_DELTA));
|
|
|