cc: Remove ScopedPtrVector and cc::remove_if.

cc/test/layer_tree_json_parser_unittest.cc

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 5521b37d5336ba3544235894d8813bf0aea25b45..c39423f3f9e62418f750c4384eb74bf481ce385f 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -50,7 +50,7 @@ bool LayerTreesMatch(LayerImpl* const layer_impl,
 
   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].get())));
+        layer_impl->children()[i].get(), layer->children()[i].get())));
   }
 
   return true;