Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: cc/test/layer_tree_test.h

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 93506800b282199bd6993c5a7ece51c639043415..5104000f9f34f1b44a9eaab02943c5d72b03186b 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -174,7 +174,7 @@ class LayerTreeTest : public testing::Test, public TestHooks {
return main_task_runner_.get();
}
Proxy* proxy() const {
- return layer_tree_host_ ? layer_tree_host_->proxy() : NULL;
+ return layer_tree_host_ ? layer_tree_host_->proxy() : nullptr;
}
bool TestEnded() const { return ended_; }

Powered by Google App Engine
This is Rietveld 408576698