| Index: cc/test/layer_tree_test.cc
|
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
|
| index 2c95269335b1f49d6b849122eed698191f14fdd0..952cf6f7f0857509b06c3f8999f031fdb5832b91 100644
|
| --- a/cc/test/layer_tree_test.cc
|
| +++ b/cc/test/layer_tree_test.cc
|
| @@ -383,7 +383,7 @@ class LayerTreeHostForTesting : public LayerTreeHost {
|
| LayerTreeHostForTesting(TestHooks* test_hooks,
|
| LayerTreeHostClient* client,
|
| const LayerTreeSettings& settings)
|
| - : LayerTreeHost(client, NULL, settings),
|
| + : LayerTreeHost(client, nullptr, settings),
|
| shared_bitmap_manager_(new TestSharedBitmapManager()),
|
| test_hooks_(test_hooks),
|
| test_started_(false) {}
|
| @@ -522,7 +522,7 @@ void LayerTreeTest::DoBeginTest() {
|
| client_.get(),
|
| settings_,
|
| base::MessageLoopProxy::current(),
|
| - impl_thread_ ? impl_thread_->message_loop_proxy() : NULL);
|
| + impl_thread_ ? impl_thread_->message_loop_proxy() : nullptr);
|
| ASSERT_TRUE(layer_tree_host_);
|
|
|
| started_ = true;
|
| @@ -712,7 +712,7 @@ int LayerTreeTest::LastCommittedSourceFrameNumber(LayerTreeHostImpl* impl)
|
|
|
| void LayerTreeTest::DestroyLayerTreeHost() {
|
| if (layer_tree_host_ && layer_tree_host_->root_layer())
|
| - layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
|
| + layer_tree_host_->root_layer()->SetLayerTreeHost(nullptr);
|
| layer_tree_host_ = nullptr;
|
| }
|
|
|
|
|