| Index: webrtc/voice_engine/voice_engine_impl.h
|
| diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h
|
| index f98f88121468d15ab24d3aee12609eb084f72f56..ed6efe3d9e7df2c91bc7bd22a221d5686d6c845d 100644
|
| --- a/webrtc/voice_engine/voice_engine_impl.h
|
| +++ b/webrtc/voice_engine/voice_engine_impl.h
|
| @@ -11,7 +11,8 @@
|
| #ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
|
| #define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
|
|
|
| -#include "webrtc/base/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "webrtc/engine_configurations.h"
|
| #include "webrtc/system_wrappers/include/atomic32.h"
|
| #include "webrtc/voice_engine/voe_base_impl.h"
|
| @@ -134,14 +135,14 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
|
|
|
| // Backdoor to access a voe::Channel object without a channel ID. This is only
|
| // to be used while refactoring the VoE API!
|
| - virtual rtc::scoped_ptr<voe::ChannelProxy> GetChannelProxy(int channel_id);
|
| + virtual std::unique_ptr<voe::ChannelProxy> GetChannelProxy(int channel_id);
|
|
|
| // This is *protected* so that FakeVoiceEngine can inherit from the class and
|
| // manipulate the reference count. See: fake_voice_engine.h.
|
| protected:
|
| Atomic32 _ref_count;
|
| private:
|
| - rtc::scoped_ptr<const Config> own_config_;
|
| + std::unique_ptr<const Config> own_config_;
|
| };
|
|
|
| } // namespace webrtc
|
|
|