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

Unified Diff: cc/test/layer_tree_json_parser_unittest.cc

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_json_parser_unittest.cc
diff --git a/cc/test/layer_tree_json_parser_unittest.cc b/cc/test/layer_tree_json_parser_unittest.cc
index 4f9c562f61036057f65ec9c09781f147cc5cf026..79f566e447eca609e8c603b25621de7b80443e4d 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -87,7 +87,7 @@ TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
tree->SetRootLayer(root_impl.Pass());
std::string json = host_impl.LayerTreeAsJson();
- scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
+ scoped_refptr<Layer> root = ParseTreeFromJson(json, nullptr);
ASSERT_TRUE(root.get());
EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
}
@@ -113,7 +113,7 @@ TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
tree->SetRootLayer(root_impl.Pass());
std::string json = host_impl.LayerTreeAsJson();
- scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
+ scoped_refptr<Layer> root = ParseTreeFromJson(json, nullptr);
ASSERT_TRUE(root.get());
EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
}

Powered by Google App Engine
This is Rietveld 408576698