Remove ScopedVector from ppapi/.

ppapi/proxy/video_encoder_resource.h

 // Copyright 2015 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.
 
 #ifndef PPAPI_PROXY_VIDEO_ENCODER_RESOURCE_H_
 #define PPAPI_PROXY_VIDEO_ENCODER_RESOURCE_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <memory>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_video_encoder_api.h"
 
 namespace base {
 class SharedMemory;
 }
 
@@ skipping 13 matching lines @@
   VideoEncoderResource(Connection connection, PP_Instance instance);
   ~VideoEncoderResource() override;
 
   thunk::PPB_VideoEncoder_API* AsPPB_VideoEncoder_API() override;
 
  private:
   struct ShmBuffer {
     ShmBuffer(uint32_t id, std::unique_ptr<base::SharedMemory> shm);
     ~ShmBuffer();
 
-    // Index of the buffer in the ScopedVector. Buffers have the same id in
+    // Index of the buffer in the vector. Buffers have the same id in
     // the plugin and the host.
     uint32_t id;
     std::unique_ptr<base::SharedMemory> shm;
   };
 
   struct BitstreamBuffer {
     BitstreamBuffer(uint32_t id, uint32_t size, bool key_frame);
     ~BitstreamBuffer();
 
-    // Index of the buffer in the ScopedVector. Same as ShmBuffer::id.
+    // Index of the buffer in the vector. Same as ShmBuffer::id.
     uint32_t id;
     uint32_t size;
     bool key_frame;
   };
 
   // PPB_VideoEncoder_API implementation.
   int32_t GetSupportedProfiles(
       const PP_ArrayOutput& output,
       const scoped_refptr<TrackedCallback>& callback) override;
   int32_t GetSupportedProfiles0_1(
@@ skipping 64 matching lines @@
 
   int32_t input_frame_count_;
   PP_Size input_coded_size_;
 
   MediaStreamBufferManager buffer_manager_;
 
   typedef std::map<PP_Resource, scoped_refptr<VideoFrameResource> >
       VideoFrameMap;
   VideoFrameMap video_frames_;
 
-  ScopedVector<ShmBuffer> shm_buffers_;
+  std::vector<std::unique_ptr<ShmBuffer>> shm_buffers_;
 
   std::deque<BitstreamBuffer> available_bitstream_buffers_;
   typedef std::map<void*, uint32_t> BitstreamBufferMap;
   BitstreamBufferMap bitstream_buffer_map_;
 
   scoped_refptr<TrackedCallback> get_supported_profiles_callback_;
   scoped_refptr<TrackedCallback> initialize_callback_;
   scoped_refptr<TrackedCallback> get_video_frame_callback_;
   PP_Resource* get_video_frame_data_;
 
   typedef std::map<PP_Resource, scoped_refptr<TrackedCallback> > EncodeMap;
   EncodeMap encode_callbacks_;
 
   scoped_refptr<TrackedCallback> get_bitstream_buffer_callback_;
   PP_BitstreamBuffer* get_bitstream_buffer_data_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoEncoderResource);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_VIDEO_ENCODER_RESOURCE_H_