| Index: webrtc/voice_engine/shared_data.h
|
| diff --git a/webrtc/voice_engine/shared_data.h b/webrtc/voice_engine/shared_data.h
|
| index 1d96103a9884fb74ea47526850b57ffb16706640..a4a852a4351412a3a368da911fcecaea2409040c 100644
|
| --- a/webrtc/voice_engine/shared_data.h
|
| +++ b/webrtc/voice_engine/shared_data.h
|
| @@ -11,8 +11,9 @@
|
| #ifndef WEBRTC_VOICE_ENGINE_SHARED_DATA_H
|
| #define WEBRTC_VOICE_ENGINE_SHARED_DATA_H
|
|
|
| +#include <memory>
|
| +
|
| #include "webrtc/base/criticalsection.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/modules/audio_device/include/audio_device.h"
|
| #include "webrtc/modules/audio_processing/include/audio_processing.h"
|
| #include "webrtc/modules/utility/include/process_thread.h"
|
| @@ -69,8 +70,8 @@ protected:
|
| AudioDeviceModule* _audioDevicePtr;
|
| OutputMixer* _outputMixerPtr;
|
| TransmitMixer* _transmitMixerPtr;
|
| - rtc::scoped_ptr<AudioProcessing> audioproc_;
|
| - rtc::scoped_ptr<ProcessThread> _moduleProcessThreadPtr;
|
| + std::unique_ptr<AudioProcessing> audioproc_;
|
| + std::unique_ptr<ProcessThread> _moduleProcessThreadPtr;
|
|
|
| AudioDeviceModule::AudioLayer _audioDeviceLayer;
|
|
|
|
|