Index: media/mojo/clients/mojo_decoder_factory.cc |
diff --git a/media/mojo/clients/mojo_decoder_factory.cc b/media/mojo/clients/mojo_decoder_factory.cc |
index baf3857e7d9faa63f3c08612b62e04d84ebec573..84b930a29795f70aaa6be60bdd4979931af0d708 100644 |
--- a/media/mojo/clients/mojo_decoder_factory.cc |
+++ b/media/mojo/clients/mojo_decoder_factory.cc |
@@ -4,6 +4,7 @@ |
#include "media/mojo/clients/mojo_decoder_factory.h" |
+#include "base/memory/ptr_util.h" |
#include "base/single_thread_task_runner.h" |
#include "media/mojo/clients/mojo_audio_decoder.h" |
#include "media/mojo/clients/mojo_video_decoder.h" |
@@ -22,27 +23,27 @@ MojoDecoderFactory::~MojoDecoderFactory() {} |
void MojoDecoderFactory::CreateAudioDecoders( |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
- ScopedVector<AudioDecoder>* audio_decoders) { |
+ std::vector<std::unique_ptr<AudioDecoder>>* audio_decoders) { |
#if defined(ENABLE_MOJO_AUDIO_DECODER) |
mojom::AudioDecoderPtr audio_decoder_ptr; |
service_manager::GetInterface<mojom::AudioDecoder>(interface_provider_, |
&audio_decoder_ptr); |
- audio_decoders->push_back( |
- new MojoAudioDecoder(task_runner, std::move(audio_decoder_ptr))); |
+ audio_decoders->push_back(base::MakeUnique<MojoAudioDecoder>( |
+ task_runner, std::move(audio_decoder_ptr))); |
#endif |
} |
void MojoDecoderFactory::CreateVideoDecoders( |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
GpuVideoAcceleratorFactories* gpu_factories, |
- ScopedVector<VideoDecoder>* video_decoders) { |
+ std::vector<std::unique_ptr<VideoDecoder>>* video_decoders) { |
#if defined(ENABLE_MOJO_VIDEO_DECODER) |
mojom::VideoDecoderPtr remote_decoder; |
service_manager::GetInterface<mojom::VideoDecoder>(interface_provider_, |
&remote_decoder); |
- video_decoders->push_back(new MojoVideoDecoder(task_runner, gpu_factories, |
- std::move(remote_decoder))); |
+ video_decoders->push_back(base::MakeUnique<MojoVideoDecoder>( |
+ task_runner, gpu_factories, std::move(remote_decoder))); |
#endif |
} |