cc: Remove ScopedPtrVector and cc::remove_if.

cc/quads/render_pass.h

Index: cc/quads/render_pass.h
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 14caeba7c7af9d0fceadac7435b9795c3d5a9000..bc64d74833f2d1b27b67b48f27360535b059160d 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -6,13 +6,13 @@
 #define CC_QUADS_RENDER_PASS_H_
 
 #include <utility>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/list_container.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/quads/render_pass_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "skia/ext/refptr.h"
@@ -64,8 +64,8 @@ class CC_EXPORT RenderPass {
   scoped_ptr<RenderPass> Copy(RenderPassId new_id) const;
 
   // A deep copy of the render passes in the list including the quads.
-  static void CopyAll(const ScopedPtrVector<RenderPass>& in,
-                      ScopedPtrVector<RenderPass>* out);
+  static void CopyAll(const std::vector<scoped_ptr<RenderPass>>& in,
+                      std::vector<scoped_ptr<RenderPass>>* out);
 
   void SetNew(RenderPassId id,
               const gfx::Rect& output_rect,
@@ -112,7 +112,7 @@ class CC_EXPORT RenderPass {
   // contents as a bitmap, and give a copy of the bitmap to each callback in
   // this list. This property should not be serialized between compositors, as
   // it only makes sense in the root compositor.
-  ScopedPtrVector<CopyOutputRequest> copy_requests;
+  std::vector<scoped_ptr<CopyOutputRequest>> copy_requests;
 
   QuadList quad_list;
   SharedQuadStateList shared_quad_state_list;
@@ -147,7 +147,7 @@ struct hash<cc::RenderPassId> {
 }  // namespace BASE_HASH_NAMESPACE
 
 namespace cc {
-typedef ScopedPtrVector<RenderPass> RenderPassList;
+typedef std::vector<scoped_ptr<RenderPass>> RenderPassList;

[danakj, 2015/11/17 01:12:17]

fun fact, this also is defined in renderer.h. wow.

[vmpstr, 2015/11/17 23:26:24]

Twice for good measure?

 typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap;
 }  // namespace cc