| Index: cc/trees/layer_tree_host_unittest_animation.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
|
| index 3bd55e533d7c0ba81d5c85563aba890e0b493ed6..a23ea0a5d66208a41db19c9422b3a540de0ff2ff 100644
|
| --- a/cc/trees/layer_tree_host_unittest_animation.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc
|
| @@ -370,7 +370,7 @@ class LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree
|
| base::TimeTicks monotonic_time,
|
| Animation::TargetProperty target_property) override {
|
| // Replace animated commits with an empty tree.
|
| - layer_tree_host()->SetRootLayer(make_scoped_refptr<Layer>(NULL));
|
| + layer_tree_host()->SetRootLayer(make_scoped_refptr<Layer>(nullptr));
|
| }
|
|
|
| virtual void DidCommit() override {
|
| @@ -671,7 +671,7 @@ class LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity
|
| EXPECT_EQ(1u, update_check_layer_->update_count());
|
|
|
| // clear update_check_layer_ so LayerTreeHost dies.
|
| - update_check_layer_ = NULL;
|
| + update_check_layer_ = nullptr;
|
| }
|
|
|
| private:
|
|
|