Update To 11.40.268.0

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

diff --git a/src/remoting/protocol/audio_reader.cc b/src/remoting/protocol/audio_reader.cc
index 72a0afd..0cede0b 100644 (file)
--- a/src/remoting/protocol/audio_reader.cc
+++ b/src/remoting/protocol/audio_reader.cc
@@ -25,9 +25,8 @@ AudioReader::~AudioReader() {
 // static
 scoped_ptr<AudioReader> AudioReader::Create(const SessionConfig& config) {
   if (!config.is_audio_enabled())
-    return scoped_ptr<AudioReader>();
-  // TODO(kxing): Support different session configurations.
-  return scoped_ptr<AudioReader>(new AudioReader(AudioPacket::ENCODING_RAW));
+    return nullptr;
+  return make_scoped_ptr(new AudioReader(AudioPacket::ENCODING_RAW));
 }
 
 void AudioReader::OnInitialized() {
@@ -36,7 +35,7 @@ void AudioReader::OnInitialized() {
 }
 
 void AudioReader::OnNewData(scoped_ptr<AudioPacket> packet,
-                                    const base::Closure& done_task) {
+                            const base::Closure& done_task) {
   audio_stub_->ProcessAudioPacket(packet.Pass(), done_task);
 }