Chromium Code Reviews| Index: cc/trees/layer_tree_host_unittest_no_message_loop.cc |
| diff --git a/cc/trees/layer_tree_host_unittest_no_message_loop.cc b/cc/trees/layer_tree_host_unittest_no_message_loop.cc |
| index fb0e2be225ffecdee4f70e0ff6ebf61fb55a5b50..14cb122c4b029846320d0e639ad0989aba75ae29 100644 |
| --- a/cc/trees/layer_tree_host_unittest_no_message_loop.cc |
| +++ b/cc/trees/layer_tree_host_unittest_no_message_loop.cc |
| @@ -101,7 +101,7 @@ class LayerTreeHostNoMessageLoopTest |
| LayerTreeSettings settings; |
| settings.single_thread_proxy_scheduler = false; |
| layer_tree_host_ = |
| - LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); |
| + LayerTreeHost::CreateSingleThreaded(this, this, nullptr, settings, nullptr); |
|
danakj
2014/10/09 16:00:53
please don't ignore our presubmit warnings. fix up
|
| layer_tree_host_->SetViewportSize(size_); |
| layer_tree_host_->SetRootLayer(root_layer_); |
| } |
| @@ -189,12 +189,12 @@ class LayerTreeHostNoMessageLoopDelegatedLayer |
| CheckReturnedResource(1u); |
| TearDownLayerTreeHost(); |
| - delegated_layer_ = NULL; |
| - frame_provider_ = NULL; |
| + delegated_layer_ = nullptr; |
| + frame_provider_ = nullptr; |
| // Resource from second frame should be returned. |
| CheckReturnedResource(1u); |
| - resource_collection_ = NULL; |
| + resource_collection_ = nullptr; |
| } |
| // DelegatedFrameResourceCollectionClient overrides. |