cc: Remove ScopedPtrVector and cc::remove_if.

cc/test/layer_tree_json_parser_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_tree_json_parser.h"
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 32 matching lines @@
                                         layer->have_wheel_event_handlers()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->have_scroll_event_handlers(),
                 layer->have_scroll_event_handlers()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_EQ(layer_impl->touch_event_handler_region(),
                 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].get())));
+        layer_impl->children()[i].get(), layer->children()[i].get())));
   }
 
   return true;
 #undef RETURN_IF_EXPECTATION_FAILS
 }
 
 }  // namespace
 
 class LayerTreeJsonParserSanityCheck : public testing::Test {
 };
@@ skipping 51 matching lines @@
   root_impl->AddChild(touch_layer.Pass());
   tree->SetRootLayer(root_impl.Pass());
 
   std::string json = host_impl.LayerTreeAsJson();
   scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
   ASSERT_TRUE(root.get());
   EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
 }
 
 }  // namespace cc