Remove ScopedVector from ppapi/.

ppapi/proxy/video_decoder_resource.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 "ppapi/proxy/video_decoder_resource.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
@@ skipping 220 matching lines @@
     if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &shm_handle))
       return PP_ERROR_NOMEMORY;
     std::unique_ptr<base::SharedMemory> shm(
         new base::SharedMemory(shm_handle, false /* read_only */));
     std::unique_ptr<ShmBuffer> shm_buffer(
         new ShmBuffer(std::move(shm), shm_size, shm_id));
     if (!shm_buffer->addr)
       return PP_ERROR_NOMEMORY;
 
     available_shm_buffers_.push_back(shm_buffer.get());
-    if (shm_buffers_.size() < kMaximumPendingDecodes) {
-      shm_buffers_.push_back(shm_buffer.release());
-    } else {
-      // Delete manually since ScopedVector won't delete the existing element if
-      // we just assign it.
-      delete shm_buffers_[shm_id];
-      shm_buffers_[shm_id] = shm_buffer.release();
-    }
+    if (shm_buffers_.size() < kMaximumPendingDecodes)
+      shm_buffers_.push_back(std::move(shm_buffer));
+    else
+      shm_buffers_[shm_id] = std::move(shm_buffer);
   }
 
   // At this point we should have shared memory to hold the plugin's buffer.
   DCHECK(!available_shm_buffers_.empty() &&
          available_shm_buffers_.back()->shm->mapped_size() >= size);
 
   ShmBuffer* shm_buffer = available_shm_buffers_.back();
   available_shm_buffers_.pop_back();
   memcpy(shm_buffer->addr, buffer, size);
 
@@ skipping 220 matching lines @@
 }
 
 void VideoDecoderResource::OnPluginMsgDecodeComplete(
     const ResourceMessageReplyParams& params,
     uint32_t shm_id) {
   if (shm_id >= shm_buffers_.size()) {
     NOTREACHED();
     return;
   }
   // Make the shm buffer available.
-  available_shm_buffers_.push_back(shm_buffers_[shm_id]);
+  available_shm_buffers_.push_back(shm_buffers_[shm_id].get());
   // If the plugin is waiting, let it call Decode again.
   if (decode_callback_.get()) {
     scoped_refptr<TrackedCallback> callback;
     callback.swap(decode_callback_);
     callback->Run(PP_OK);
   }
 }
 
 void VideoDecoderResource::OnPluginMsgFlushComplete(
     const ResourceMessageReplyParams& params) {
@@ skipping 76 matching lines @@
     get_picture_0_1_->texture_target = texture_target;
     get_picture_0_1_->texture_size = texture_size;
     get_picture_0_1_ = NULL;
   }
 
   received_pictures_.pop();
 }
 
 }  // namespace proxy
 }  // namespace ppapi