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

media/filters/decoder_selector.h

 // Copyright 2014 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_FILTERS_DECODER_SELECTOR_H_
 #define MEDIA_FILTERS_DECODER_SELECTOR_H_
 
 #include <memory>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/pipeline_status.h"
 #include "media/filters/decoder_stream_traits.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
@@ skipping 11 matching lines @@
 template<DemuxerStream::Type StreamType>
 class MEDIA_EXPORT DecoderSelector {
  public:
   typedef DecoderStreamTraits<StreamType> StreamTraits;
   typedef typename StreamTraits::DecoderType Decoder;
   typedef typename StreamTraits::DecoderConfigType DecoderConfig;
 
   // Callback to create a list of decoders to select from.
   // TODO(xhwang): Use a DecoderFactory to create decoders one by one as needed,
   // instead of creating a list of decoders all at once.
-  using CreateDecodersCB = base::RepeatingCallback<ScopedVector<Decoder>()>;
+  using CreateDecodersCB =
+      base::RepeatingCallback<std::vector<std::unique_ptr<Decoder>>()>;
 
   // Indicates completion of Decoder selection.
   // - First parameter: The initialized Decoder. If it's set to NULL, then
   // Decoder initialization failed.
   // - Second parameter: The initialized DecryptingDemuxerStream. If it's not
   // NULL, then a DecryptingDemuxerStream is created and initialized to do
   // decryption for the initialized Decoder.
   // Note: The caller owns selected Decoder and DecryptingDemuxerStream.
   // The caller should call DecryptingDemuxerStream::Reset() before
   // calling Decoder::Reset() to release any pending decryption or read.
@@ skipping 53 matching lines @@
   // Could be the |stream| passed in SelectDecoder, or |decrypted_stream_| when
   // a DecryptingDemuxerStream is selected.
   DemuxerStream* input_stream_;
 
   CdmContext* cdm_context_;
   std::string blacklisted_decoder_;
   SelectDecoderCB select_decoder_cb_;
   typename Decoder::OutputCB output_cb_;
   base::Closure waiting_for_decryption_key_cb_;
 
-  ScopedVector<Decoder> decoders_;
+  std::vector<std::unique_ptr<Decoder>> decoders_;
 
   std::unique_ptr<Decoder> decoder_;
   std::unique_ptr<DecryptingDemuxerStream> decrypted_stream_;
 
   // Config of the |input_stream| used to initialize decoders.
   DecoderConfig config_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
 };
 
 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_SELECTOR_H_