cc: Use scoped_ptrs in surface multimaps.

Instead of managing raw pointers, use scoped ptrs now that we can!

BUG=557388
R=danakj@chromium.org, jbauman@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1455843005

Cr-Commit-Position: refs/heads/master@{#360412}

1 files changed, 4 insertions, 7 deletions

diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index f5649b1..8faff98 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -110,19 +110,16 @@ void Surface::RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> copy_request) {
 }
 
 void Surface::TakeCopyOutputRequests(
-    std::multimap<RenderPassId, CopyOutputRequest*>* copy_requests) {
+    std::multimap<RenderPassId, scoped_ptr<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 =
-            PopBack(&render_pass->copy_requests);
-        // TODO(vmpstr): |copy_requests| should store scoped_ptrs.
-        // crbug.com/557388.
+      for (auto& request : render_pass->copy_requests) {
         copy_requests->insert(
-            std::make_pair(render_pass->id, request.release()));
+            std::make_pair(render_pass->id, std::move(request)));
       }
+      render_pass->copy_requests.clear();
     }
   }
 }