| Index: cc/layers/layer_unittest.cc
|
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
|
| index 3950cf2946b28e5714a3f645269febfd3ba2f0c2..846951d896762dd318dd3e3a4fb9f50c62b67bb0 100644
|
| --- a/cc/layers/layer_unittest.cc
|
| +++ b/cc/layers/layer_unittest.cc
|
| @@ -78,7 +78,7 @@ class LayerTest : public testing::Test {
|
| grand_child3_ = NULL;
|
|
|
| layer_tree_host_->SetRootLayer(NULL);
|
| - layer_tree_host_.reset();
|
| + layer_tree_host_ = nullptr;
|
| }
|
|
|
| void VerifyTestTreeInitialState() const {
|
| @@ -1144,10 +1144,7 @@ static bool AddTestAnimation(Layer* layer) {
|
| 0.7f,
|
| scoped_ptr<TimingFunction>()));
|
| scoped_ptr<Animation> animation =
|
| - Animation::Create(curve.PassAs<AnimationCurve>(),
|
| - 0,
|
| - 0,
|
| - Animation::Opacity);
|
| + Animation::Create(curve.Pass(), 0, 0, Animation::Opacity);
|
|
|
| return layer->AddAnimation(animation.Pass());
|
| }
|
|
|