| Index: media/audio/fake_audio_input_stream.h
|
| diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
|
| index 6ec1ff4e3f759ae7cedd819e2a1075017b2af2fb..670b481609f768fd837c006efae10623f87d9957 100644
|
| --- a/media/audio/fake_audio_input_stream.h
|
| +++ b/media/audio/fake_audio_input_stream.h
|
| @@ -7,11 +7,11 @@
|
| #ifndef MEDIA_AUDIO_FAKE_AUDIO_INPUT_STREAM_H_
|
| #define MEDIA_AUDIO_FAKE_AUDIO_INPUT_STREAM_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "media/audio/audio_io.h"
|
| #include "media/audio/fake_audio_worker.h"
|
| #include "media/base/audio_parameters.h"
|
| @@ -60,7 +60,7 @@ class MEDIA_EXPORT FakeAudioInputStream
|
| const AudioParameters& params);
|
| ~FakeAudioInputStream() override;
|
|
|
| - scoped_ptr<AudioOutputStream::AudioSourceCallback> ChooseSource();
|
| + std::unique_ptr<AudioOutputStream::AudioSourceCallback> ChooseSource();
|
| void ReadAudioFromSource();
|
|
|
| AudioManagerBase* audio_manager_;
|
| @@ -68,8 +68,8 @@ class MEDIA_EXPORT FakeAudioInputStream
|
| FakeAudioWorker fake_audio_worker_;
|
| AudioParameters params_;
|
|
|
| - scoped_ptr<AudioOutputStream::AudioSourceCallback> audio_source_;
|
| - scoped_ptr<media::AudioBus> audio_bus_;
|
| + std::unique_ptr<AudioOutputStream::AudioSourceCallback> audio_source_;
|
| + std::unique_ptr<media::AudioBus> audio_bus_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FakeAudioInputStream);
|
| };
|
|
|