cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_host_common.h

Index: cc/trees/layer_tree_host_common.h
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 7593314c4bda0061a03e2b474e576b9ba4e584fc..f17bc7fb95ae811c6aa518552882c9e939e8cf6b 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/trees/property_tree.h"
 #include "ui/gfx/geometry/rect.h"
@@ -149,7 +149,7 @@ class CC_EXPORT LayerTreeHostCommon {
 
   static LayerImpl* get_layer_as_raw_ptr(const OwnedLayerImplList& layers,
                                          size_t index) {
-    return layers[index];
+    return layers[index].get();
   }
 
   static LayerImpl* get_layer_as_raw_ptr(const LayerImplList& layers,
@@ -173,7 +173,10 @@ struct CC_EXPORT ScrollAndScaleSet {
   float page_scale_delta;
   gfx::Vector2dF elastic_overscroll_delta;
   float top_controls_delta;
-  ScopedPtrVector<SwapPromise> swap_promises;
+  std::vector<scoped_ptr<SwapPromise>> swap_promises;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet);
 };
 
 template <typename LayerType>