Remove ScopedVector from content/renderer/.

content/renderer/pepper/pepper_video_decoder_host.cc

 // Copyright (c) 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 "content/renderer/pepper/pepper_video_decoder_host.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
@@ skipping 186 matching lines @@
     return PP_ERROR_FAILED;
 
   content::RenderThread* render_thread = content::RenderThread::Get();
   std::unique_ptr<base::SharedMemory> shm(
       render_thread->HostAllocateSharedMemoryBuffer(shm_size));
   if (!shm || !shm->Map(shm_size))
     return PP_ERROR_FAILED;
 
   base::SharedMemoryHandle shm_handle = shm->handle();
   if (shm_id == shm_buffers_.size()) {
-    shm_buffers_.push_back(shm.release());
+    shm_buffers_.push_back(std::move(shm));
     shm_buffer_busy_.push_back(false);
   } else {
-    // Remove the old buffer. Delete manually since ScopedVector won't delete
-    // the existing element if we just assign over it.
-    delete shm_buffers_[shm_id];
-    shm_buffers_[shm_id] = shm.release();
+    shm_buffers_[shm_id] = std::move(shm);
   }
 
   SerializedHandle handle(
       renderer_ppapi_host_->ShareSharedMemoryHandleWithRemote(shm_handle),
       shm_size);
   ppapi::host::ReplyMessageContext reply_context =
       context->MakeReplyMessageContext();
   reply_context.params.AppendHandle(handle);
   host()->SendReply(reply_context,
                     PpapiPluginMsg_VideoDecoder_GetShmReply(shm_size));
@@ skipping 335 matching lines @@
 
 PepperVideoDecoderHost::PendingDecodeList::iterator
 PepperVideoDecoderHost::GetPendingDecodeById(int32_t decode_id) {
   return std::find_if(pending_decodes_.begin(), pending_decodes_.end(),
                       [decode_id](const PendingDecode& item) {
                         return item.decode_id == decode_id;
                       });
 }
 
 }  // namespace content