cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_host.cc

 // Copyright 2011 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.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <algorithm>
 #include <stack>
 #include <string>
 
@@ skipping 796 matching lines @@
   bool did_paint_content = false;
   for (const auto& layer : update_layer_list) {
     did_paint_content |= layer->Update();
     content_is_suitable_for_gpu_rasterization_ &=
         layer->IsSuitableForGpuRasterization();
   }
   return did_paint_content;
 }
 
 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()),
                            TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT,
                            "step", "Main thread scroll update");
     QueueSwapPromise(swap_promise.Pass());
   }
 
   gfx::Vector2dF inner_viewport_scroll_delta;
   gfx::Vector2dF outer_viewport_scroll_delta;
@@ skipping 193 matching lines @@
   for (; it != swap_promise_monitor_.end(); it++)
     (*it)->OnSetNeedsCommitOnMain();
 }
 
 void LayerTreeHost::QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise) {
   DCHECK(swap_promise);
   swap_promise_list_.push_back(swap_promise.Pass());
 }
 
 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();
 }
 
 void LayerTreeHost::set_surface_id_namespace(uint32_t id_namespace) {
   surface_id_namespace_ = id_namespace;
 }
 
 SurfaceSequence LayerTreeHost::CreateSurfaceSequence() {
   return SurfaceSequence(surface_id_namespace_, next_surface_sequence_++);
 }
@@ skipping 196 matching lines @@
   return animation_host_ ? animation_host_->HasAnyAnimation(layer->id())
                          : false;
 }
 
 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const {
   return animation_host_ ? animation_host_->HasActiveAnimation(layer->id())
                          : false;
 }
 
 }  // namespace cc