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

Unified Diff: cc/test/layer_tree_json_parser_unittest.cc

Issue 502203003: Remove implicit conversions from scoped_refptr to T* in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to use .get() instead of rewriting local variable Created 6 years, 4 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
« no previous file with comments | « cc/scheduler/scheduler_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61a2f7f9de58f974736b3d96d3932425e8525648..4f9c562f61036057f65ec9c09781f147cc5cf026 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -50,9 +50,8 @@ bool LayerTreesMatch(LayerImpl* const layer_impl,
layer->touch_event_handler_region()));
for (size_t i = 0; i < layer_impl->children().size(); ++i) {
- RETURN_IF_EXPECTATION_FAILS(
- EXPECT_TRUE(LayerTreesMatch(layer_impl->children()[i],
- layer->children()[i])));
+ RETURN_IF_EXPECTATION_FAILS(EXPECT_TRUE(LayerTreesMatch(
+ layer_impl->children()[i], layer->children()[i].get())));
}
return true;
@@ -89,7 +88,7 @@ TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
std::string json = host_impl.LayerTreeAsJson();
scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
- ASSERT_TRUE(root);
+ ASSERT_TRUE(root.get());
EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
}
@@ -115,7 +114,7 @@ TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
std::string json = host_impl.LayerTreeAsJson();
scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
- ASSERT_TRUE(root);
+ ASSERT_TRUE(root.get());
EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
}
« no previous file with comments | « cc/scheduler/scheduler_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698