| Index: remoting/codec/audio_decoder.cc
|
| diff --git a/remoting/codec/audio_decoder.cc b/remoting/codec/audio_decoder.cc
|
| index 326b4587053c3d9d0898feb052baec4542070f8e..3e5dfacae95c1cd88ef9d496b8f279ef2da5162b 100644
|
| --- a/remoting/codec/audio_decoder.cc
|
| +++ b/remoting/codec/audio_decoder.cc
|
| @@ -5,20 +5,21 @@
|
| #include "remoting/codec/audio_decoder.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "remoting/codec/audio_decoder_opus.h"
|
| #include "remoting/codec/audio_decoder_verbatim.h"
|
| #include "remoting/protocol/session_config.h"
|
|
|
| namespace remoting {
|
|
|
| -scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
|
| +std::unique_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
|
| const protocol::SessionConfig& config) {
|
| const protocol::ChannelConfig& audio_config = config.audio_config();
|
|
|
| if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
|
| - return make_scoped_ptr(new AudioDecoderVerbatim());
|
| + return base::WrapUnique(new AudioDecoderVerbatim());
|
| } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
|
| - return make_scoped_ptr(new AudioDecoderOpus());
|
| + return base::WrapUnique(new AudioDecoderOpus());
|
| }
|
|
|
| NOTIMPLEMENTED();
|
|
|