cc: Remove ScopedPtrVector and cc::remove_if.

cc/layers/render_surface_unittest.cc

Index: cc/layers/render_surface_unittest.cc
diff --git a/cc/layers/render_surface_unittest.cc b/cc/layers/render_surface_unittest.cc
index f4b94115d90afbcbe1132ec622e130d77181019e..b4990b1247c965dbcbbff874a7d296f6cf6f094e 100644
--- a/cc/layers/render_surface_unittest.cc
+++ b/cc/layers/render_surface_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/render_pass_sink.h"
@@ -180,7 +179,7 @@ TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectRenderPass) {
   render_surface->AppendRenderPasses(&pass_sink);
 
   ASSERT_EQ(1u, pass_sink.RenderPasses().size());
-  RenderPass* pass = pass_sink.RenderPasses()[0];
+  RenderPass* pass = pass_sink.RenderPasses()[0].get();
 
   EXPECT_EQ(RenderPassId(2, 0), pass->id);
   EXPECT_EQ(content_rect, pass->output_rect);