Change unique_ptr::reset() for std::move

media/gpu/v4l2_video_decode_accelerator.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 "media/gpu/v4l2_video_decode_accelerator.h"
 
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
@@ skipping 630 matching lines @@
   if (decoder_state_ != kInitialized && decoder_state_ != kDecoding) {
     DVLOGF(2) << "early out: state=" << decoder_state_;
     return;
   }
 
   if (decoder_current_bitstream_buffer_ == NULL) {
     if (decoder_input_queue_.empty()) {
       // We're waiting for a new buffer -- exit without scheduling a new task.
       return;
     }
-    linked_ptr<BitstreamBufferRef>& buffer_ref = decoder_input_queue_.front();
+    std::unique_ptr<BitstreamBufferRef>& buffer_ref =

[sandersd (OOO until July 31), 2016/09/13 18:30:59]

This change does not make sense to me, since the queue is of linked_ptrs.

+        decoder_input_queue_.front();
     if (decoder_delay_bitstream_buffer_id_ == buffer_ref->input_id) {
       // We're asked to delay decoding on this and subsequent buffers.
       return;
     }
 
     // Setup to use the next buffer.
-    decoder_current_bitstream_buffer_.reset(buffer_ref.release());
+    decoder_current_bitstream_buffer_ = std::move(buffer_ref);
     decoder_input_queue_.pop();
     const auto& shm = decoder_current_bitstream_buffer_->shm;
     if (shm) {
       DVLOGF(3) << "reading input_id="
                 << decoder_current_bitstream_buffer_->input_id
                 << ", addr=" << shm->memory() << ", size=" << shm->size();
     } else {
       DCHECK_EQ(decoder_current_bitstream_buffer_->input_id, kFlushBufferId);
       DVLOGF(3) << "reading input_id=kFlushBufferId";
     }
@@ skipping 1620 matching lines @@
       Enqueue();
   }
 }
 
 void V4L2VideoDecodeAccelerator::ImageProcessorError() {
   LOGF(ERROR) << "Image processor error";
   NOTIFY_ERROR(PLATFORM_FAILURE);
 }
 
 }  // namespace media