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

media/base/decoder_factory.h

 // Copyright 2016 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 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 {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class AudioDecoder;
 class GpuVideoAcceleratorFactories;
 class VideoDecoder;
 
 // A factory class for creating audio and video decoders.
 class MEDIA_EXPORT DecoderFactory {
  public:
   DecoderFactory();
   virtual ~DecoderFactory();
 
   // Creates audio decoders and append them to the end of |audio_decoders|.
   // 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);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECODER_FACTORY_H_