Convert //cc from scoped_ptr to std::unique_ptr.

cc/animation/animation_unittest.cc

Index: cc/animation/animation_unittest.cc
diff --git a/cc/animation/animation_unittest.cc b/cc/animation/animation_unittest.cc
index 3bb984a0aec9425e3def79eb0d0273fef07bdac8..f20e3f1218d71ad944127fbd33f41e56a55ed7b5 100644
--- a/cc/animation/animation_unittest.cc
+++ b/cc/animation/animation_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "cc/animation/animation.h"
 
+#include "base/memory/ptr_util.h"
 #include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -18,27 +19,27 @@ static base::TimeTicks TicksFromSecondsF(double seconds) {
                                             base::Time::kMicrosecondsPerSecond);
 }
 
-scoped_ptr<Animation> CreateAnimation(double iterations,
-                                      double duration,
-                                      double playback_rate) {
-  scoped_ptr<Animation> to_return(
-      Animation::Create(make_scoped_ptr(new FakeFloatAnimationCurve(duration)),
+std::unique_ptr<Animation> CreateAnimation(double iterations,
+                                           double duration,
+                                           double playback_rate) {
+  std::unique_ptr<Animation> to_return(
+      Animation::Create(base::WrapUnique(new FakeFloatAnimationCurve(duration)),
                         0, 1, TargetProperty::OPACITY));
   to_return->set_iterations(iterations);
   to_return->set_playback_rate(playback_rate);
   return to_return;
 }
 
-scoped_ptr<Animation> CreateAnimation(double iterations, double duration) {
+std::unique_ptr<Animation> CreateAnimation(double iterations, double duration) {
   return CreateAnimation(iterations, duration, 1);
 }
 
-scoped_ptr<Animation> CreateAnimation(double iterations) {
+std::unique_ptr<Animation> CreateAnimation(double iterations) {
   return CreateAnimation(iterations, 1, 1);
 }
 
 TEST(AnimationTest, TrimTimeZeroIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(0));
+  std::unique_ptr<Animation> anim(CreateAnimation(0));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -48,7 +49,7 @@ TEST(AnimationTest, TrimTimeZeroIterations) {
 }
 
 TEST(AnimationTest, TrimTimeOneIteration) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -60,7 +61,7 @@ TEST(AnimationTest, TrimTimeOneIteration) {
 }
 
 TEST(AnimationTest, TrimTimeOneHalfIteration) {
-  scoped_ptr<Animation> anim(CreateAnimation(1.5));
+  std::unique_ptr<Animation> anim(CreateAnimation(1.5));
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                      .InSecondsF());
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
@@ -78,7 +79,7 @@ TEST(AnimationTest, TrimTimeOneHalfIteration) {
 }
 
 TEST(AnimationTest, TrimTimeInfiniteIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
+  std::unique_ptr<Animation> anim(CreateAnimation(-1));
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.5))
@@ -90,7 +91,7 @@ TEST(AnimationTest, TrimTimeInfiniteIterations) {
 }
 
 TEST(AnimationTest, TrimTimeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
+  std::unique_ptr<Animation> anim(CreateAnimation(-1));
   anim->set_direction(Animation::DIRECTION_REVERSE);
   EXPECT_EQ(
       1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0)).InSecondsF());
@@ -107,7 +108,7 @@ TEST(AnimationTest, TrimTimeReverse) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateInfiniteIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
+  std::unique_ptr<Animation> anim(CreateAnimation(-1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -124,7 +125,7 @@ TEST(AnimationTest, TrimTimeAlternateInfiniteIterations) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateOneIteration) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -141,7 +142,7 @@ TEST(AnimationTest, TrimTimeAlternateOneIteration) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateTwoIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(2));
+  std::unique_ptr<Animation> anim(CreateAnimation(2));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -164,7 +165,7 @@ TEST(AnimationTest, TrimTimeAlternateTwoIterations) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateTwoHalfIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(2.5));
+  std::unique_ptr<Animation> anim(CreateAnimation(2.5));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -191,7 +192,7 @@ TEST(AnimationTest, TrimTimeAlternateTwoHalfIterations) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateReverseInfiniteIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
+  std::unique_ptr<Animation> anim(CreateAnimation(-1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE_REVERSE);
   EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -208,7 +209,7 @@ TEST(AnimationTest, TrimTimeAlternateReverseInfiniteIterations) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateReverseOneIteration) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE_REVERSE);
   EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -225,7 +226,7 @@ TEST(AnimationTest, TrimTimeAlternateReverseOneIteration) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateReverseTwoIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(2));
+  std::unique_ptr<Animation> anim(CreateAnimation(2));
   anim->set_direction(Animation::DIRECTION_ALTERNATE_REVERSE);
   EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -248,7 +249,7 @@ TEST(AnimationTest, TrimTimeAlternateReverseTwoIterations) {
 }
 
 TEST(AnimationTest, TrimTimeStartTime) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_start_time(TicksFromSecondsF(4));
   EXPECT_EQ(
       0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)).InSecondsF());
@@ -263,7 +264,7 @@ TEST(AnimationTest, TrimTimeStartTime) {
 }
 
 TEST(AnimationTest, TrimTimeStartTimeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_start_time(TicksFromSecondsF(4));
   anim->set_direction(Animation::DIRECTION_REVERSE);
   EXPECT_EQ(
@@ -279,7 +280,7 @@ TEST(AnimationTest, TrimTimeStartTimeReverse) {
 }
 
 TEST(AnimationTest, TrimTimeTimeOffset) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(TimeDelta::FromMilliseconds(4000));
   anim->set_start_time(TicksFromSecondsF(4));
   EXPECT_EQ(
@@ -293,7 +294,7 @@ TEST(AnimationTest, TrimTimeTimeOffset) {
 }
 
 TEST(AnimationTest, TrimTimeTimeOffsetReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(TimeDelta::FromMilliseconds(4000));
   anim->set_start_time(TicksFromSecondsF(4));
   anim->set_direction(Animation::DIRECTION_REVERSE);
@@ -308,7 +309,7 @@ TEST(AnimationTest, TrimTimeTimeOffsetReverse) {
 }
 
 TEST(AnimationTest, TrimTimeNegativeTimeOffset) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(TimeDelta::FromMilliseconds(-4000));
 
   EXPECT_EQ(
@@ -322,7 +323,7 @@ TEST(AnimationTest, TrimTimeNegativeTimeOffset) {
 }
 
 TEST(AnimationTest, TrimTimeNegativeTimeOffsetReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(TimeDelta::FromMilliseconds(-4000));
   anim->set_direction(Animation::DIRECTION_REVERSE);
 
@@ -337,7 +338,7 @@ TEST(AnimationTest, TrimTimeNegativeTimeOffsetReverse) {
 }
 
 TEST(AnimationTest, TrimTimePauseResume) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_EQ(
       0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)).InSecondsF());
@@ -354,7 +355,7 @@ TEST(AnimationTest, TrimTimePauseResume) {
 }
 
 TEST(AnimationTest, TrimTimePauseResumeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_direction(Animation::DIRECTION_REVERSE);
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
@@ -372,7 +373,7 @@ TEST(AnimationTest, TrimTimePauseResumeReverse) {
 }
 
 TEST(AnimationTest, TrimTimeSuspendResume) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_EQ(
       0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)).InSecondsF());
@@ -389,7 +390,7 @@ TEST(AnimationTest, TrimTimeSuspendResume) {
 }
 
 TEST(AnimationTest, TrimTimeSuspendResumeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_direction(Animation::DIRECTION_REVERSE);
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
@@ -407,7 +408,7 @@ TEST(AnimationTest, TrimTimeSuspendResumeReverse) {
 }
 
 TEST(AnimationTest, TrimTimeZeroDuration) {
-  scoped_ptr<Animation> anim(CreateAnimation(0, 0));
+  std::unique_ptr<Animation> anim(CreateAnimation(0, 0));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
@@ -418,7 +419,7 @@ TEST(AnimationTest, TrimTimeZeroDuration) {
 }
 
 TEST(AnimationTest, TrimTimeStarting) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 5.0));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 5.0));
   anim->SetRunState(Animation::STARTING, TicksFromSecondsF(0.0));
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                      .InSecondsF());
@@ -445,7 +446,7 @@ TEST(AnimationTest, TrimTimeStarting) {
 }
 
 TEST(AnimationTest, TrimTimeNeedsSynchronizedStartTime) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 5.0));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 5.0));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   anim->set_needs_synchronized_start_time(true);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
@@ -472,7 +473,7 @@ TEST(AnimationTest, TrimTimeNeedsSynchronizedStartTime) {
 }
 
 TEST(AnimationTest, IsFinishedAtZeroIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(0));
+  std::unique_ptr<Animation> anim(CreateAnimation(0));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_FALSE(anim->IsFinishedAt(TicksFromSecondsF(-1.0)));
   EXPECT_TRUE(anim->IsFinishedAt(TicksFromSecondsF(0.0)));
@@ -480,7 +481,7 @@ TEST(AnimationTest, IsFinishedAtZeroIterations) {
 }
 
 TEST(AnimationTest, IsFinishedAtOneIteration) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_FALSE(anim->IsFinishedAt(TicksFromSecondsF(-1.0)));
   EXPECT_FALSE(anim->IsFinishedAt(TicksFromSecondsF(0.0)));
@@ -489,7 +490,7 @@ TEST(AnimationTest, IsFinishedAtOneIteration) {
 }
 
 TEST(AnimationTest, IsFinishedAtInfiniteIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
+  std::unique_ptr<Animation> anim(CreateAnimation(-1));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_FALSE(anim->IsFinishedAt(TicksFromSecondsF(0.0)));
   EXPECT_FALSE(anim->IsFinishedAt(TicksFromSecondsF(0.5)));
@@ -498,7 +499,7 @@ TEST(AnimationTest, IsFinishedAtInfiniteIterations) {
 }
 
 TEST(AnimationTest, IsFinishedNegativeTimeOffset) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(TimeDelta::FromMilliseconds(-500));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
 
@@ -512,7 +513,7 @@ TEST(AnimationTest, IsFinishedNegativeTimeOffset) {
 }
 
 TEST(AnimationTest, IsFinishedPositiveTimeOffset) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(TimeDelta::FromMilliseconds(500));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
 
@@ -523,7 +524,7 @@ TEST(AnimationTest, IsFinishedPositiveTimeOffset) {
 }
 
 TEST(AnimationTest, IsFinishedAtNotRunning) {
-  scoped_ptr<Animation> anim(CreateAnimation(0));
+  std::unique_ptr<Animation> anim(CreateAnimation(0));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_TRUE(anim->IsFinishedAt(TicksFromSecondsF(0.0)));
   anim->SetRunState(Animation::PAUSED, TicksFromSecondsF(0.0));
@@ -538,7 +539,7 @@ TEST(AnimationTest, IsFinishedAtNotRunning) {
 }
 
 TEST(AnimationTest, IsFinished) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
   EXPECT_FALSE(anim->is_finished());
   anim->SetRunState(Animation::PAUSED, TicksFromSecondsF(0.0));
@@ -553,7 +554,7 @@ TEST(AnimationTest, IsFinished) {
 }
 
 TEST(AnimationTest, IsFinishedNeedsSynchronizedStartTime) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(2.0));
   EXPECT_FALSE(anim->is_finished());
   anim->SetRunState(Animation::PAUSED, TicksFromSecondsF(2.0));
@@ -568,7 +569,7 @@ TEST(AnimationTest, IsFinishedNeedsSynchronizedStartTime) {
 }
 
 TEST(AnimationTest, RunStateChangesIgnoredWhileSuspended) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->Suspend(TicksFromSecondsF(0));
   EXPECT_EQ(Animation::PAUSED, anim->run_state());
   anim->SetRunState(Animation::RUNNING, TicksFromSecondsF(0.0));
@@ -579,7 +580,7 @@ TEST(AnimationTest, RunStateChangesIgnoredWhileSuspended) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackNormal) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 1, 1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 1, 1));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -593,7 +594,7 @@ TEST(AnimationTest, TrimTimePlaybackNormal) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackSlow) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 1, 0.5));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 1, 0.5));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -609,7 +610,7 @@ TEST(AnimationTest, TrimTimePlaybackSlow) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackFast) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 4, 2));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 4, 2));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -627,7 +628,7 @@ TEST(AnimationTest, TrimTimePlaybackFast) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackNormalReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 2, -1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 2, -1));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -645,7 +646,7 @@ TEST(AnimationTest, TrimTimePlaybackNormalReverse) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackSlowReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 2, -0.5));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 2, -0.5));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -671,7 +672,7 @@ TEST(AnimationTest, TrimTimePlaybackSlowReverse) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackFastReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 2, -2));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 2, -2));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
   EXPECT_EQ(
@@ -689,7 +690,7 @@ TEST(AnimationTest, TrimTimePlaybackFastReverse) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackFastInfiniteIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1, 4, 4));
+  std::unique_ptr<Animation> anim(CreateAnimation(-1, 4, 4));
   EXPECT_EQ(
       0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0)).InSecondsF());
   EXPECT_EQ(
@@ -705,7 +706,7 @@ TEST(AnimationTest, TrimTimePlaybackFastInfiniteIterations) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackNormalDoubleReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 1, -1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 1, -1));
   anim->set_direction(Animation::DIRECTION_REVERSE);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
@@ -720,7 +721,7 @@ TEST(AnimationTest, TrimTimePlaybackNormalDoubleReverse) {
 }
 
 TEST(AnimationTest, TrimTimePlaybackFastDoubleReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 4, -2));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 4, -2));
   anim->set_direction(Animation::DIRECTION_REVERSE);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                    .InSecondsF());
@@ -739,7 +740,7 @@ TEST(AnimationTest, TrimTimePlaybackFastDoubleReverse) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateTwoIterationsPlaybackFast) {
-  scoped_ptr<Animation> anim(CreateAnimation(2, 2, 2));
+  std::unique_ptr<Animation> anim(CreateAnimation(2, 2, 2));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -764,7 +765,7 @@ TEST(AnimationTest, TrimTimeAlternateTwoIterationsPlaybackFast) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateTwoIterationsPlaybackFastReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(2, 2, 2));
+  std::unique_ptr<Animation> anim(CreateAnimation(2, 2, 2));
   anim->set_direction(Animation::DIRECTION_ALTERNATE_REVERSE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                      .InSecondsF());
@@ -791,7 +792,7 @@ TEST(AnimationTest, TrimTimeAlternateTwoIterationsPlaybackFastReverse) {
 }
 
 TEST(AnimationTest, TrimTimeAlternateTwoIterationsPlaybackFastDoubleReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(2, 2, -2));
+  std::unique_ptr<Animation> anim(CreateAnimation(2, 2, -2));
   anim->set_direction(Animation::DIRECTION_ALTERNATE_REVERSE);
   EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -817,7 +818,7 @@ TEST(AnimationTest, TrimTimeAlternateTwoIterationsPlaybackFastDoubleReverse) {
 
 TEST(AnimationTest,
      TrimTimeAlternateReverseThreeIterationsPlaybackFastAlternateReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(3, 2, -2));
+  std::unique_ptr<Animation> anim(CreateAnimation(3, 2, -2));
   anim->set_direction(Animation::DIRECTION_ALTERNATE_REVERSE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -851,7 +852,7 @@ TEST(AnimationTest,
 
 TEST(AnimationTest,
      TrimTimeAlternateReverseTwoIterationsPlaybackNormalAlternate) {
-  scoped_ptr<Animation> anim(CreateAnimation(2, 2, -1));
+  std::unique_ptr<Animation> anim(CreateAnimation(2, 2, -1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
                      .InSecondsF());
@@ -876,7 +877,7 @@ TEST(AnimationTest,
 }
 
 TEST(AnimationTest, TrimTimeIterationStart) {
-  scoped_ptr<Animation> anim(CreateAnimation(2, 1, 1));
+  std::unique_ptr<Animation> anim(CreateAnimation(2, 1, 1));
   anim->set_iteration_start(0.5);
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
                      .InSecondsF());
@@ -895,7 +896,7 @@ TEST(AnimationTest, TrimTimeIterationStart) {
 }
 
 TEST(AnimationTest, TrimTimeIterationStartAlternate) {
-  scoped_ptr<Animation> anim(CreateAnimation(2, 1, 1));
+  std::unique_ptr<Animation> anim(CreateAnimation(2, 1, 1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   anim->set_iteration_start(0.3);
   EXPECT_EQ(0.3, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
@@ -915,7 +916,7 @@ TEST(AnimationTest, TrimTimeIterationStartAlternate) {
 }
 
 TEST(AnimationTest, TrimTimeIterationStartAlternateThreeIterations) {
-  scoped_ptr<Animation> anim(CreateAnimation(3, 1, 1));
+  std::unique_ptr<Animation> anim(CreateAnimation(3, 1, 1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   anim->set_iteration_start(1);
   EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(-1.0))
@@ -940,7 +941,7 @@ TEST(AnimationTest, TrimTimeIterationStartAlternateThreeIterations) {
 
 TEST(AnimationTest,
      TrimTimeIterationStartAlternateThreeIterationsPlaybackReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(3, 1, -1));
+  std::unique_ptr<Animation> anim(CreateAnimation(3, 1, -1));
   anim->set_direction(Animation::DIRECTION_ALTERNATE);
   anim->set_iteration_start(1);
   EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(0.0))
@@ -956,7 +957,7 @@ TEST(AnimationTest,
 }
 
 TEST(AnimationTest, InEffectFillMode) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1));
   anim->set_fill_mode(Animation::FILL_MODE_NONE);
   EXPECT_FALSE(anim->InEffect(TicksFromSecondsF(-1.0)));
   EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
@@ -979,7 +980,7 @@ TEST(AnimationTest, InEffectFillMode) {
 }
 
 TEST(AnimationTest, InEffectFillModePlayback) {
-  scoped_ptr<Animation> anim(CreateAnimation(1, 1, -1));
+  std::unique_ptr<Animation> anim(CreateAnimation(1, 1, -1));
   anim->set_fill_mode(Animation::FILL_MODE_NONE);
   EXPECT_FALSE(anim->InEffect(TicksFromSecondsF(-1.0)));
   EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));