| Index: media/test/pipeline_integration_test_base.h
|
| diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
|
| index 82304897309b18d6eb7a710357793f0e3cefdebb..4205d166687aee90e3eb7c89684f31fcf330b4db 100644
|
| --- a/media/test/pipeline_integration_test_base.h
|
| +++ b/media/test/pipeline_integration_test_base.h
|
| @@ -6,6 +6,7 @@
|
| #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
|
|
|
| #include <stdint.h>
|
| +#include <memory>
|
|
|
| #include "base/md5.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -120,12 +121,12 @@ class PipelineIntegrationTestBase {
|
| base::MD5Context md5_context_;
|
| bool hashing_enabled_;
|
| bool clockless_playback_;
|
| - scoped_ptr<Demuxer> demuxer_;
|
| - scoped_ptr<DataSource> data_source_;
|
| - scoped_ptr<PipelineImpl> pipeline_;
|
| + std::unique_ptr<Demuxer> demuxer_;
|
| + std::unique_ptr<DataSource> data_source_;
|
| + std::unique_ptr<PipelineImpl> pipeline_;
|
| scoped_refptr<NullAudioSink> audio_sink_;
|
| scoped_refptr<ClocklessAudioSink> clockless_audio_sink_;
|
| - scoped_ptr<NullVideoSink> video_sink_;
|
| + std::unique_ptr<NullVideoSink> video_sink_;
|
| bool ended_;
|
| PipelineStatus pipeline_status_;
|
| Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
|
| @@ -135,7 +136,7 @@ class PipelineIntegrationTestBase {
|
| AudioHardwareConfig hardware_config_;
|
| PipelineMetadata metadata_;
|
|
|
| - PipelineStatus StartInternal(scoped_ptr<DataSource> data_source,
|
| + PipelineStatus StartInternal(std::unique_ptr<DataSource> data_source,
|
| CdmContext* cdm_context,
|
| uint8_t test_type);
|
|
|
| @@ -148,17 +149,17 @@ class PipelineIntegrationTestBase {
|
| void DemuxerEncryptedMediaInitDataCB(EmeInitDataType type,
|
| const std::vector<uint8_t>& init_data);
|
|
|
| - void DemuxerMediaTracksUpdatedCB(scoped_ptr<MediaTracks> tracks);
|
| + void DemuxerMediaTracksUpdatedCB(std::unique_ptr<MediaTracks> tracks);
|
|
|
| void OnEnded();
|
| void OnError(PipelineStatus status);
|
| void QuitAfterCurrentTimeTask(const base::TimeDelta& quit_time);
|
|
|
| // Creates Demuxer and sets |demuxer_|.
|
| - void CreateDemuxer(scoped_ptr<DataSource> data_source);
|
| + void CreateDemuxer(std::unique_ptr<DataSource> data_source);
|
|
|
| // Creates and returns a Renderer.
|
| - virtual scoped_ptr<Renderer> CreateRenderer();
|
| + virtual std::unique_ptr<Renderer> CreateRenderer();
|
|
|
| void OnVideoFramePaint(const scoped_refptr<VideoFrame>& frame);
|
|
|
|
|