Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / codec / audio_decoder.cc

diff --git a/src/remoting/codec/audio_decoder.cc b/src/remoting/codec/audio_decoder.cc
index 26e13eb..326b458 100644 (file)
--- a/src/remoting/codec/audio_decoder.cc
+++ b/src/remoting/codec/audio_decoder.cc
@@ -16,13 +16,13 @@ scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
   const protocol::ChannelConfig& audio_config = config.audio_config();
 
   if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
-    return scoped_ptr<AudioDecoder>(new AudioDecoderVerbatim());
+    return make_scoped_ptr(new AudioDecoderVerbatim());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
-    return scoped_ptr<AudioDecoder>(new AudioDecoderOpus());
+    return make_scoped_ptr(new AudioDecoderOpus());
   }
 
   NOTIMPLEMENTED();
-  return scoped_ptr<AudioDecoder>();
+  return nullptr;
 }
 
 }  // namespace remoting