cc: Remove ScopedPtrVector and cc::remove_if.

cc/test/surface_aggregator_test_helpers.h

 // Copyright 2014 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.
 
 #ifndef CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_
 #define CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_
 
-#include "cc/base/scoped_ptr_vector.h"
+#include <vector>
+
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 class RenderPass;
 class Surface;
 class TestRenderPass;
 
-typedef ScopedPtrVector<RenderPass> RenderPassList;
+typedef std::vector<scoped_ptr<RenderPass>> RenderPassList;
 
 namespace test {
 
 struct Quad {
   static Quad SolidColorQuad(SkColor color) {
     Quad quad;
     quad.material = DrawQuad::SOLID_COLOR;
     quad.color = color;
     return quad;
   }
@@ skipping 53 matching lines @@
 void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass);
 
 void TestPassesMatchExpectations(Pass* expected_passes,
                                  size_t expected_pass_count,
                                  const RenderPassList* passes);
 
 }  // namespace test
 }  // namespace cc
 
 #endif  // CC_TEST_SURFACE_AGGREGATOR_TEST_HELPERS_H_