| Index: webrtc/voice_engine/voice_engine_impl.cc
|
| diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc
|
| index d0b741207671141c95482c0f2c83d5fa1e2fb384..919d0e8efd34ded7d760b73a7fcea2667905f701 100644
|
| --- a/webrtc/voice_engine/voice_engine_impl.cc
|
| +++ b/webrtc/voice_engine/voice_engine_impl.cc
|
| @@ -62,12 +62,12 @@ int VoiceEngineImpl::Release() {
|
| return new_ref;
|
| }
|
|
|
| -rtc::scoped_ptr<voe::ChannelProxy> VoiceEngineImpl::GetChannelProxy(
|
| +std::unique_ptr<voe::ChannelProxy> VoiceEngineImpl::GetChannelProxy(
|
| int channel_id) {
|
| RTC_DCHECK(channel_id >= 0);
|
| rtc::CritScope cs(crit_sec());
|
| RTC_DCHECK(statistics().Initialized());
|
| - return rtc::scoped_ptr<voe::ChannelProxy>(
|
| + return std::unique_ptr<voe::ChannelProxy>(
|
| new voe::ChannelProxy(channel_manager().GetChannel(channel_id)));
|
| }
|
|
|
|
|