cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/tree_synchronizer_unittest.cc

 // Copyright 2011 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/trees/tree_synchronizer.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 169 matching lines @@
     const std::set<Layer*>* clip_children =
         layer_clip_parent->clip_children();
     ASSERT_EQ(layer_clip_parent->id(), layer_impl_clip_parent->id());
     ASSERT_TRUE(clip_children->find(layer) != clip_children->end());
     ASSERT_TRUE(clip_children_impl->find(layer_impl) !=
                 clip_children_impl->end());
   }
 
   for (size_t i = 0; i < layer_children.size(); ++i) {
     SCOPED_TRACE(base::StringPrintf("child layer %" PRIuS, i).c_str());
-    ExpectTreesAreIdentical(
-        layer_children[i].get(), layer_impl_children[i], tree_impl);
+    ExpectTreesAreIdentical(layer_children[i].get(),
+                            layer_impl_children[i].get(), tree_impl);
   }
 }
 
 class TreeSynchronizerTest : public testing::Test {
  public:
   TreeSynchronizerTest()
       : client_(FakeLayerTreeHostClient::DIRECT_3D),
         host_(FakeLayerTreeHost::Create(&client_, &task_graph_runner_)) {}
 
  protected:
@@ skipping 538 matching lines @@
                           host_impl->active_tree());
 
   // The clip children should have been unhooked.
   EXPECT_EQ(2u, intervening->children().size());
   EXPECT_FALSE(clip_child2->clip_parent());
   EXPECT_FALSE(additional_clip_child->clip_parent());
 }
 
 }  // namespace
 }  // namespace cc