cc: Remove ScopedPtrVector and cc::remove_if.

cc/output/gl_renderer.h

Index: cc/output/gl_renderer.h
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index 0aa4e8f42ed7d3394c60ad9d8e99de243429a27b..59c32d92843390d67725674dc297eaa7f2aed783 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -6,10 +6,10 @@
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include <deque>
+#include <vector>
 
 #include "base/cancelable_callback.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer_draw_cache.h"
 #include "cc/output/program_binding.h"
@@ -259,8 +259,8 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
 
   void ScheduleOverlays(DrawingFrame* frame);
 
-  typedef ScopedPtrVector<ResourceProvider::ScopedReadLockGL>
-      OverlayResourceLockList;
+  using OverlayResourceLockList =
+      std::vector<scoped_ptr<ResourceProvider::ScopedReadLockGL>>;
   OverlayResourceLockList pending_overlay_resources_;
   OverlayResourceLockList in_use_overlay_resources_;
   OverlayResourceLockList previous_swap_overlay_resources_;
@@ -500,7 +500,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
   int highp_threshold_cache_;
 
   struct PendingAsyncReadPixels;
-  ScopedPtrVector<PendingAsyncReadPixels> pending_async_read_pixels_;
+  std::vector<scoped_ptr<PendingAsyncReadPixels>> pending_async_read_pixels_;
 
   scoped_ptr<ResourceProvider::ScopedWriteLockGL> current_framebuffer_lock_;