Index: cc/test/animation_test_common.cc |
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc |
index 7c1b3f6730b166e50fdd74ec5a29e5ad230378a0..5ab8942ccc18a182a9f8a3b62146f41d83a94a3f 100644 |
--- a/cc/test/animation_test_common.cc |
+++ b/cc/test/animation_test_common.cc |
@@ -36,8 +36,7 @@ int AddOpacityTransition(Target* target, |
func = EaseTimingFunction::Create(); |
if (duration > 0.0) |
curve->AddKeyframe(FloatKeyframe::Create(0.0, start_opacity, func.Pass())); |
- curve->AddKeyframe(FloatKeyframe::Create( |
- duration, end_opacity, scoped_ptr<TimingFunction>())); |
+ curve->AddKeyframe(FloatKeyframe::Create(duration, end_opacity, nullptr)); |
int id = AnimationIdProvider::NextAnimationId(); |
@@ -61,12 +60,11 @@ int AddAnimatedTransform(Target* target, |
curve(KeyframedTransformAnimationCurve::Create()); |
if (duration > 0.0) { |
- curve->AddKeyframe(TransformKeyframe::Create( |
- 0.0, start_operations, scoped_ptr<TimingFunction>())); |
+ curve->AddKeyframe( |
+ TransformKeyframe::Create(0.0, start_operations, nullptr)); |
} |
- curve->AddKeyframe(TransformKeyframe::Create( |
- duration, operations, scoped_ptr<TimingFunction>())); |
+ curve->AddKeyframe(TransformKeyframe::Create(duration, operations, nullptr)); |
int id = AnimationIdProvider::NextAnimationId(); |
@@ -108,14 +106,12 @@ int AddAnimatedFilter(Target* target, |
FilterOperations start_filters; |
start_filters.Append( |
FilterOperation::CreateBrightnessFilter(start_brightness)); |
- curve->AddKeyframe(FilterKeyframe::Create( |
- 0.0, start_filters, scoped_ptr<TimingFunction>())); |
+ curve->AddKeyframe(FilterKeyframe::Create(0.0, start_filters, nullptr)); |
} |
FilterOperations filters; |
filters.Append(FilterOperation::CreateBrightnessFilter(end_brightness)); |
- curve->AddKeyframe( |
- FilterKeyframe::Create(duration, filters, scoped_ptr<TimingFunction>())); |
+ curve->AddKeyframe(FilterKeyframe::Create(duration, filters, nullptr)); |
int id = AnimationIdProvider::NextAnimationId(); |