Cleanup usage of scoped_ptr<> in remoting for C++11

 - Use nullptr to initialize null scoped_ptr().
 - use Pass(), PassAs() is no longer required.

Review URL: https://codereview.chromium.org/609923004

Cr-Commit-Position: refs/heads/master@{#297236}

5 files changed, 12 insertions, 12 deletions

diff --git a/remoting/codec/audio_decoder.cc b/remoting/codec/audio_decoder.cc
index 26e13eb..20e7d8b 100644
--- a/remoting/codec/audio_decoder.cc
+++ b/remoting/codec/audio_decoder.cc
@@ -22,7 +22,7 @@ scoped_ptr<AudioDecoder> AudioDecoder::CreateAudioDecoder(
   }
 
   NOTIMPLEMENTED();
-  return scoped_ptr<AudioDecoder>();
+  return nullptr;
 }
 
 }  // namespace remoting
diff --git a/remoting/codec/audio_decoder_opus.cc b/remoting/codec/audio_decoder_opus.cc
index 3d8fabf..27f01fd 100644
--- a/remoting/codec/audio_decoder_opus.cc
+++ b/remoting/codec/audio_decoder_opus.cc
@@ -81,15 +81,15 @@ scoped_ptr<AudioPacket> AudioDecoderOpus::Decode(
   if (packet->encoding() != AudioPacket::ENCODING_OPUS) {
     LOG(WARNING) << "Received an audio packet with encoding "
                  << packet->encoding() << " when an OPUS packet was expected.";
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
   }
   if (packet->data_size() > kMaxFramesPerPacket) {
     LOG(WARNING) << "Received an packet with too many frames.";
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
   }
 
   if (!ResetForPacket(packet.get())) {
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
   }
 
   // Create a new packet of decoded data.
@@ -121,7 +121,7 @@ scoped_ptr<AudioPacket> AudioDecoderOpus::Decode(
     if (result < 0) {
       LOG(ERROR) << "Failed decoding Opus frame. Error code: " << result;
       DestroyDecoder();
-      return scoped_ptr<AudioPacket>();
+      return nullptr;
     }
 
     buffer_pos += result * packet->channels() *
@@ -129,7 +129,7 @@ scoped_ptr<AudioPacket> AudioDecoderOpus::Decode(
   }
 
   if (!buffer_pos) {
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
   }
 
   decoded_data->resize(buffer_pos);
diff --git a/remoting/codec/audio_decoder_verbatim.cc b/remoting/codec/audio_decoder_verbatim.cc
index 6c9b639..a04e2a5 100644
--- a/remoting/codec/audio_decoder_verbatim.cc
+++ b/remoting/codec/audio_decoder_verbatim.cc
@@ -26,7 +26,7 @@ scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode(
       (packet->data(0).size() %
        (AudioPacket::CHANNELS_STEREO * AudioPacket::BYTES_PER_SAMPLE_2) != 0)) {
     LOG(WARNING) << "Verbatim decoder received an invalid packet.";
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
   }
   return packet.Pass();
 }
diff --git a/remoting/codec/audio_encoder_opus.cc b/remoting/codec/audio_encoder_opus.cc
index 53bfe0b..b2a9b5e 100644
--- a/remoting/codec/audio_encoder_opus.cc
+++ b/remoting/codec/audio_encoder_opus.cc
@@ -142,7 +142,7 @@ scoped_ptr<AudioPacket> AudioEncoderOpus::Encode(
 
   if (!ResetForPacket(packet.get())) {
     LOG(ERROR) << "Encoder initialization failed";
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
   }
 
   int samples_in_packet = packet->data(0).size() / kBytesPerSample / channels_;
@@ -200,7 +200,7 @@ scoped_ptr<AudioPacket> AudioEncoderOpus::Encode(
                              buffer, data->length());
     if (result < 0) {
       LOG(ERROR) << "opus_encode() failed with error code: " << result;
-      return scoped_ptr<AudioPacket>();
+      return nullptr;
     }
 
     DCHECK_LE(result, static_cast<int>(data->length()));
@@ -230,7 +230,7 @@ scoped_ptr<AudioPacket> AudioEncoderOpus::Encode(
 
   // Return NULL if there's nothing in the packet.
   if (encoded_packet->data_size() == 0)
-    return scoped_ptr<AudioPacket>();
+    return nullptr;
 
   return encoded_packet.Pass();
 }
diff --git a/remoting/codec/video_decoder_vpx.cc b/remoting/codec/video_decoder_vpx.cc
index 0be9201..bae8c23 100644
--- a/remoting/codec/video_decoder_vpx.cc
+++ b/remoting/codec/video_decoder_vpx.cc
@@ -56,7 +56,7 @@ scoped_ptr<VideoDecoderVpx> VideoDecoderVpx::CreateForVP8() {
       vpx_codec_dec_init(codec.get(), vpx_codec_vp8_dx(), &config, 0);
   if (ret != VPX_CODEC_OK) {
     LOG(ERROR) << "Cannot initialize codec.";
-    return scoped_ptr<VideoDecoderVpx>();
+    return nullptr;
   }
 
   return scoped_ptr<VideoDecoderVpx>(new VideoDecoderVpx(codec.Pass()));
@@ -76,7 +76,7 @@ scoped_ptr<VideoDecoderVpx> VideoDecoderVpx::CreateForVP9() {
       vpx_codec_dec_init(codec.get(), vpx_codec_vp9_dx(), &config, 0);
   if (ret != VPX_CODEC_OK) {
     LOG(ERROR) << "Cannot initialize codec.";
-    return scoped_ptr<VideoDecoderVpx>();
+    return nullptr;
   }
 
   return scoped_ptr<VideoDecoderVpx>(new VideoDecoderVpx(codec.Pass()));