| 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()));
|
| }
|
|
|
|
|