Index: cc/trees/layer_tree_host_unittest_animation_timelines.cc |
diff --git a/cc/trees/layer_tree_host_unittest_animation_timelines.cc b/cc/trees/layer_tree_host_unittest_animation_timelines.cc |
index 30b69ee1fb38692d59440014c940dbfa3239e549..da0c6ef56148d592db651d921fc9997a85a9e799 100644 |
--- a/cc/trees/layer_tree_host_unittest_animation_timelines.cc |
+++ b/cc/trees/layer_tree_host_unittest_animation_timelines.cc |
@@ -425,8 +425,8 @@ class LayerTreeHostTimelinesTestLayerAddedWithAnimation |
// Any valid AnimationCurve will do here. |
scoped_ptr<AnimationCurve> curve(new FakeFloatAnimationCurve()); |
scoped_ptr<Animation> animation( |
- Animation::Create(curve.Pass(), 1, 1, Animation::OPACITY)); |
- player_->AddAnimation(animation.Pass()); |
+ Animation::Create(std::move(curve), 1, 1, Animation::OPACITY)); |
+ player_->AddAnimation(std::move(animation)); |
// We add the animation *before* attaching the layer to the tree. |
layer_tree_host()->root_layer()->AddChild(layer); |
@@ -559,13 +559,13 @@ class LayerTreeHostTimelinesTestScrollOffsetChangesArePropagated |
ScrollOffsetAnimationCurve::Create( |
gfx::ScrollOffset(500.f, 550.f), |
EaseInOutTimingFunction::Create())); |
- scoped_ptr<Animation> animation( |
- Animation::Create(curve.Pass(), 1, 0, Animation::SCROLL_OFFSET)); |
+ scoped_ptr<Animation> animation(Animation::Create( |
+ std::move(curve), 1, 0, Animation::SCROLL_OFFSET)); |
animation->set_needs_synchronized_start_time(true); |
bool impl_scrolling_supported = |
layer_tree_host()->proxy()->SupportsImplScrolling(); |
if (impl_scrolling_supported) |
- player_child_->AddAnimation(animation.Pass()); |
+ player_child_->AddAnimation(std::move(animation)); |
else |
EndTest(); |
break; |
@@ -611,12 +611,12 @@ class LayerTreeHostTimelinesTestScrollOffsetAnimationRemoval |
ScrollOffsetAnimationCurve::Create(gfx::ScrollOffset(6500.f, 7500.f), |
EaseInOutTimingFunction::Create())); |
scoped_ptr<Animation> animation( |
- Animation::Create(curve.Pass(), 1, 0, Animation::SCROLL_OFFSET)); |
+ Animation::Create(std::move(curve), 1, 0, Animation::SCROLL_OFFSET)); |
animation->set_needs_synchronized_start_time(true); |
AttachPlayersToTimeline(); |
player_child_->AttachLayer(scroll_layer_->id()); |
- player_child_->AddAnimation(animation.Pass()); |
+ player_child_->AddAnimation(std::move(animation)); |
} |
void BeginTest() override { PostSetNeedsCommitToMainThread(); } |