| Index: media/audio/audio_output_device.cc
|
| diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
|
| index 303f0d64587955ec32d1219378f5a6f894b6920d..e6dcb11baf485f5996df30960b76897bb8f544e2 100644
|
| --- a/media/audio/audio_output_device.cc
|
| +++ b/media/audio/audio_output_device.cc
|
| @@ -41,14 +41,14 @@ class AudioOutputDevice::AudioThreadCallback
|
|
|
| private:
|
| AudioRendererSink::RenderCallback* render_callback_;
|
| - scoped_ptr<AudioBus> output_bus_;
|
| + std::unique_ptr<AudioBus> output_bus_;
|
| uint64_t callback_num_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback);
|
| };
|
|
|
| AudioOutputDevice::AudioOutputDevice(
|
| - scoped_ptr<AudioOutputIPC> ipc,
|
| + std::unique_ptr<AudioOutputIPC> ipc,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
|
| int session_id,
|
| const std::string& device_id,
|
|
|