| Index: webrtc/voice_engine/channel_manager.h
|
| diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h
|
| index 7c869590974b617c679b564029379ed853de90c9..77dfc454d882f0ecece0859c657331c3720bb1a8 100644
|
| --- a/webrtc/voice_engine/channel_manager.h
|
| +++ b/webrtc/voice_engine/channel_manager.h
|
| @@ -11,11 +11,11 @@
|
| #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
|
| #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "webrtc/base/constructormagic.h"
|
| #include "webrtc/base/criticalsection.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/call/rtc_event_log.h"
|
| #include "webrtc/system_wrappers/include/atomic32.h"
|
| #include "webrtc/typedefs.h"
|
| @@ -62,7 +62,7 @@ class ChannelOwner {
|
| // deleted when no references to them are held.
|
| struct ChannelRef {
|
| ChannelRef(Channel* channel);
|
| - const rtc::scoped_ptr<Channel> channel;
|
| + const std::unique_ptr<Channel> channel;
|
| Atomic32 ref_count;
|
| };
|
|
|
| @@ -127,7 +127,7 @@ class ChannelManager {
|
| std::vector<ChannelOwner> channels_;
|
|
|
| const Config& config_;
|
| - rtc::scoped_ptr<RtcEventLog> event_log_;
|
| + std::unique_ptr<RtcEventLog> event_log_;
|
|
|
| RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
|
| };
|
|
|