Teach BindToLoop to create callbacks that accept scoped parameters.

content/common/gpu/media/vaapi_h264_decoder.cc

 // Copyright (c) 2012 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 <dlfcn.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1044 matching lines @@
   // Find the surface associated with the picture to be decoded.
   DecodeSurface* dec_surface =
       poc_to_decode_surfaces_[curr_pic_->pic_order_cnt];
   DVLOG(4) << "Decoding POC " << curr_pic_->pic_order_cnt
            << " into surface " << dec_surface->va_surface_id();
 
   DVLOG(4) << "Pending VA bufs to commit: " << pending_va_bufs_.size();
   DVLOG(4) << "Pending slice bufs to commit: " << pending_slice_bufs_.size();
 
   DCHECK(pending_slice_bufs_.size());
-  std::queue<VABufferID>* va_bufs = new std::queue<VABufferID>();
+  scoped_ptr<std::queue<VABufferID> > va_bufs(new std::queue<VABufferID>());
   std::swap(*va_bufs, pending_va_bufs_);
-  std::queue<VABufferID>* slice_bufs = new std::queue<VABufferID>();
+  scoped_ptr<std::queue<VABufferID> > slice_bufs(new std::queue<VABufferID>());
   std::swap(*slice_bufs, pending_slice_bufs_);
 
   // Fire up a parallel job on the GPU on the ChildThread to decode and put
   // the decoded/converted/scaled picture into the pixmap.
   // Callee will take care of freeing the buffer queues.
-  submit_decode_cb_.Run(dec_surface->picture_buffer_id(), va_bufs, slice_bufs);
+  submit_decode_cb_.Run(
+      dec_surface->picture_buffer_id(), va_bufs.Pass(), slice_bufs.Pass());
 
   // Used to notify clients that we had sufficient data to start decoding
   // a new frame.
   frame_ready_at_hw_ = true;
 
   return true;
 }
 
 void VaapiH264Decoder::DestroyBuffers(size_t num_va_buffers,
                                       const VABufferID* va_buffers) {
@@ skipping 1271 matching lines @@
       VAAPI_SyncSurface &&
       VAAPI_BeginPicture &&
       VAAPI_RenderPicture &&
       VAAPI_EndPicture &&
       VAAPI_CreateBuffer &&
       VAAPI_DestroyBuffer &&
       VAAPI_ErrorStr;
 }
 
 }  // namespace content