Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / protocol / audio_writer.cc

diff --git a/src/remoting/protocol/audio_writer.cc b/src/remoting/protocol/audio_writer.cc
index b1855e4..a6c8f4b 100644 (file)
--- a/src/remoting/protocol/audio_writer.cc
+++ b/src/remoting/protocol/audio_writer.cc
@@ -8,9 +8,9 @@
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/audio.pb.h"
+#include "remoting/protocol/message_serialization.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
-#include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
@@ -36,9 +36,8 @@ void AudioWriter::ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
 // static
 scoped_ptr<AudioWriter> AudioWriter::Create(const SessionConfig& config) {
   if (!config.is_audio_enabled())
-    return scoped_ptr<AudioWriter>();
-  // TODO(kxing): Support different session configurations.
-  return scoped_ptr<AudioWriter>(new AudioWriter());
+    return nullptr;
+  return make_scoped_ptr(new AudioWriter());
 }
 
 }  // namespace protocol