cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_host.cc

Index: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 74dc211045a01d8f229ce22cd0ab28ab45af6cb1..602ee4c4fa5546505e897701f0384d57aebe0ad6 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -814,9 +814,10 @@ bool LayerTreeHost::DoUpdateLayers(Layer* root_layer) {
 }
 
 void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) {
-  ScopedPtrVector<SwapPromise>::iterator it = info->swap_promises.begin();
+  std::vector<scoped_ptr<SwapPromise>>::iterator it =
+      info->swap_promises.begin();
   for (; it != info->swap_promises.end(); ++it) {

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

hm.. why isn't this range-based?

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

Hmm. I'm not sure. I changed it...

-    scoped_ptr<SwapPromise> swap_promise(info->swap_promises.take(it));
+    scoped_ptr<SwapPromise> swap_promise(it->Pass());
     TRACE_EVENT_WITH_FLOW1("input,benchmark",
                            "LatencyInfo.Flow",
                            TRACE_ID_DONT_MANGLE(swap_promise->TraceId()),
@@ -1030,13 +1031,13 @@ void LayerTreeHost::QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise) {
 }
 
 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
-  for (auto* swap_promise : swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

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

auto

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

Done.

     swap_promise->DidNotSwap(reason);
   swap_promise_list_.clear();
 }
 
 void LayerTreeHost::OnCommitForSwapPromises() {
-  for (auto* swap_promise : swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

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

auto

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

Done.

     swap_promise->OnCommit();
 }