Remove ScopedVector from content/renderer/.

content/renderer/pepper/pepper_video_encoder_host.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 CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "content/common/content_export.h"
 #include "gpu/command_buffer/client/gpu_control_client.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ppapi/c/pp_codecs.h"
 #include "ppapi/c/ppb_video_frame.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
 
@@ skipping 20 matching lines @@
  private:
   friend class VideoEncoderShim;
 
   // Shared memory buffers.
   struct ShmBuffer {
     ShmBuffer(uint32_t id, std::unique_ptr<base::SharedMemory> shm);
     ~ShmBuffer();
 
     media::BitstreamBuffer ToBitstreamBuffer();
 
-    // Index of the buffer in the ScopedVector. Buffers have the same id in
+    // Index of the buffer in the |shm_buffers_|. Buffers have the same id in
     // the plugin and the host.
     uint32_t id;
     std::unique_ptr<base::SharedMemory> shm;
     bool in_use;
   };
 
   // media::VideoEncodeAccelerator implementation.
   void RequireBitstreamBuffers(unsigned int input_count,
                                const gfx::Size& input_coded_size,
                                size_t output_buffer_size) override;
@@ skipping 54 matching lines @@
   void FrameReleased(const ppapi::host::ReplyMessageContext& reply_context,
                      uint32_t frame_id);
   void NotifyPepperError(int32_t error);
 
   // Helper method for VideoEncoderShim.
   uint8_t* ShmHandleToAddress(int32_t buffer_id);
 
   // Non-owning pointer.
   RendererPpapiHost* renderer_ppapi_host_;
 
-  ScopedVector<ShmBuffer> shm_buffers_;
+  std::vector<std::unique_ptr<ShmBuffer>> shm_buffers_;
 
   // Buffer manager for shared memory that holds video frames.
   ppapi::MediaStreamBufferManager buffer_manager_;
 
   std::unique_ptr<gpu::CommandBufferProxyImpl> command_buffer_;
 
   std::unique_ptr<media::VideoEncodeAccelerator> encoder_;
 
   // Whether the encoder has been successfully initialized.
   bool initialized_;
@@ skipping 27 matching lines @@
 #endif
 
   base::WeakPtrFactory<PepperVideoEncoderHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperVideoEncoderHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_VIDEO_ENCODER_HOST_H_