Remove ScopedVector from audio/video renderer related code in media/

media/base/decoder_factory.h

Index: media/base/decoder_factory.h
diff --git a/media/base/decoder_factory.h b/media/base/decoder_factory.h
index 06df353439d15b4f9c0c8de58e4a82911c7f53a1..6d073401e043dd4504929691597c4cc66e70df3a 100644
--- a/media/base/decoder_factory.h
+++ b/media/base/decoder_factory.h
@@ -5,9 +5,12 @@
 #ifndef MEDIA_BASE_DECODER_FACTORY_H_
 #define MEDIA_BASE_DECODER_FACTORY_H_
 
+#include <memory>
+#include <vector>
+
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"

[xhwang, 2017/05/10 16:41:24]

Not needed in this header file. In .cc files where MakeUnique() etc is used we
need to add this include there.

[xiaofengzhang, 2017/05/11 06:34:43]

Done. Thanks!

 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "media/base/media_export.h"
 
 namespace base {
@@ -30,14 +33,14 @@ class MEDIA_EXPORT DecoderFactory {
   // Decoders are single-threaded, each decoder should run on |task_runner|.
   virtual void CreateAudioDecoders(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-      ScopedVector<AudioDecoder>* audio_decoders);
+      std::vector<std::unique_ptr<AudioDecoder>>* audio_decoders);
 
   // Creates video decoders and append them to the end of |video_decoders|.
   // Decoders are single-threaded, each decoder should run on |task_runner|.
   virtual void CreateVideoDecoders(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       GpuVideoAcceleratorFactories* gpu_factories,
-      ScopedVector<VideoDecoder>* video_decoders);
+      std::vector<std::unique_ptr<VideoDecoder>>* video_decoders);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DecoderFactory);