cc: Remove ScopedPtrVector and cc::remove_if.

cc/surfaces/surface.cc

 // Copyright 2014 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/surfaces/surface.h"
 
 #include <algorithm>
 
+#include "cc/base/container_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
 
 // The frame index starts at 2 so that empty frames will be treated as
 // completely damaged the first time they're drawn from.
@@ skipping 90 matching lines @@
 }
 
 void Surface::TakeCopyOutputRequests(
     std::multimap<RenderPassId, CopyOutputRequest*>* copy_requests) {
   DCHECK(copy_requests->empty());
   if (current_frame_) {
     for (const auto& render_pass :
          current_frame_->delegated_frame_data->render_pass_list) {
       while (!render_pass->copy_requests.empty()) {
         scoped_ptr<CopyOutputRequest> request =
-            render_pass->copy_requests.take_back();
-        render_pass->copy_requests.pop_back();
+            TakeBack(&render_pass->copy_requests);
         copy_requests->insert(
             std::make_pair(render_pass->id, request.release()));

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

can you put a TODO and a bug to make this multimap hold scoped_ptrs?

or send me a CL

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

I'll do this as a follow-up. Added a TODO.

       }
     }
   }
 }
 
 const CompositorFrame* Surface::GetEligibleFrame() {
   return current_frame_.get();
 }
 
 void Surface::TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info) {
@@ skipping 66 matching lines @@
   if (current_frame_) {
     for (const auto& render_pass :
          current_frame_->delegated_frame_data->render_pass_list) {
       for (const auto& copy_request : render_pass->copy_requests)
         copy_request->SendEmptyResult();
     }
   }
 }
 
 }  // namespace cc