Remove implicit conversions from scoped_refptr to T* in media/

This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.

BUG=110610

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

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

9 files changed, 23 insertions, 23 deletions

diff --git a/media/base/audio_discard_helper.cc b/media/base/audio_discard_helper.cc
index 06e7a31..8405d0b 100644
--- a/media/base/audio_discard_helper.cc
+++ b/media/base/audio_discard_helper.cc
@@ -71,7 +71,7 @@ bool AudioDiscardHelper::ProcessBuffers(
   }
   DCHECK(initialized());
 
-  if (!decoded_buffer) {
+  if (!decoded_buffer.get()) {
     // If there's a one buffer delay for decoding, we need to save it so it can
     // be processed with the next decoder buffer.
     if (first_buffer) {
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index cb58a03..6cca1dd 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -51,8 +51,8 @@ class AudioRendererMixerTest
         std::tr1::get<1>(GetParam()), 16, kLowLatencyBufferSize);
 
     sink_ = new MockAudioRendererSink();
-    EXPECT_CALL(*sink_, Start());
-    EXPECT_CALL(*sink_, Stop());
+    EXPECT_CALL(*sink_.get(), Start());
+    EXPECT_CALL(*sink_.get(), Stop());
 
     mixer_.reset(new AudioRendererMixer(
         input_parameters_, output_parameters_, sink_));
diff --git a/media/base/audio_splicer.cc b/media/base/audio_splicer.cc
index 0c8ac34..c8e0d4d 100644
--- a/media/base/audio_splicer.cc
+++ b/media/base/audio_splicer.cc
@@ -440,7 +440,7 @@ scoped_ptr<AudioBus> AudioSplicer::ExtractCrossfadeFromPreSplice(
   // called if there is not enough data to crossfade.
   // TODO(dalecurtis): Convert to DCHECK() once http://crbug.com/356073 fixed.
   CHECK(output_bus);
-  CHECK(*crossfade_buffer);
+  CHECK(crossfade_buffer->get());
 
   // All necessary buffers have been processed, it's safe to reset.
   pre_splice_sanitizer_->Reset();
@@ -477,7 +477,7 @@ void AudioSplicer::CrossfadePostSplice(
     // If only part of the buffer was consumed, save it for after we've added
     // the crossfade buffer
     if (frames_to_read < postroll->frame_count()) {
-      DCHECK(!remainder);
+      DCHECK(!remainder.get());
       remainder.swap(postroll);
       frames_to_trim = frames_to_read;
     }
@@ -495,7 +495,7 @@ void AudioSplicer::CrossfadePostSplice(
   CHECK(output_sanitizer_->AddInput(crossfade_buffer));
   DCHECK_EQ(crossfade_buffer->frame_count(), output_bus->frames());
 
-  if (remainder) {
+  if (remainder.get()) {
     // Trim off consumed frames.
     AccurateTrimStart(frames_to_trim, remainder, output_ts_helper);
     CHECK(output_sanitizer_->AddInput(remainder));
diff --git a/media/base/audio_splicer_unittest.cc b/media/base/audio_splicer_unittest.cc
index 86131bf..0d2c606 100644
--- a/media/base/audio_splicer_unittest.cc
+++ b/media/base/audio_splicer_unittest.cc
@@ -115,7 +115,7 @@ class AudioSplicerTest : public ::testing::Test {
       float cf_ratio = 0;
       const float cf_increment = 1.0f / frames;
       for (int i = 0; i < frames; ++i, cf_ratio += cf_increment) {
-        if (overlapped_buffer_2 && i >= second_overlap_index)
+        if (overlapped_buffer_2.get() && i >= second_overlap_index)
           overlapped_value = GetValue(overlapped_buffer_2);
         const float actual = bus->channel(ch)[i];
         const float expected =
diff --git a/media/base/stream_parser_buffer.cc b/media/base/stream_parser_buffer.cc
index a9a12e3..cf25db6 100644
--- a/media/base/stream_parser_buffer.cc
+++ b/media/base/stream_parser_buffer.cc
@@ -69,7 +69,7 @@ DecodeTimestamp StreamParserBuffer::GetDecodeTimestamp() const {
 
 void StreamParserBuffer::SetDecodeTimestamp(DecodeTimestamp timestamp) {
   decode_timestamp_ = timestamp;
-  if (preroll_buffer_)
+  if (preroll_buffer_.get())
     preroll_buffer_->SetDecodeTimestamp(timestamp);
 }
 
@@ -99,7 +99,7 @@ int StreamParserBuffer::GetConfigId() const {
 
 void StreamParserBuffer::SetConfigId(int config_id) {
   config_id_ = config_id;
-  if (preroll_buffer_)
+  if (preroll_buffer_.get())
     preroll_buffer_->SetConfigId(config_id);
 }
 
@@ -128,8 +128,8 @@ void StreamParserBuffer::ConvertToSpliceBuffer(
   // on that behavior.
 
   // Move over any preroll from this buffer.
-  if (preroll_buffer_) {
-    DCHECK(!overlapping_buffer->preroll_buffer_);
+  if (preroll_buffer_.get()) {
+    DCHECK(!overlapping_buffer->preroll_buffer_.get());
     overlapping_buffer->preroll_buffer_.swap(preroll_buffer_);
   }
 
@@ -158,9 +158,9 @@ void StreamParserBuffer::ConvertToSpliceBuffer(
        ++it) {
     const scoped_refptr<StreamParserBuffer>& buffer = *it;
     DCHECK(!buffer->end_of_stream());
-    DCHECK(!buffer->preroll_buffer());
+    DCHECK(!buffer->preroll_buffer().get());
     DCHECK(buffer->splice_buffers().empty());
-    splice_buffers_.push_back(CopyBuffer(*buffer));
+    splice_buffers_.push_back(CopyBuffer(*buffer.get()));
     splice_buffers_.back()->set_splice_timestamp(splice_timestamp());
   }
 
@@ -169,10 +169,10 @@ void StreamParserBuffer::ConvertToSpliceBuffer(
 
 void StreamParserBuffer::SetPrerollBuffer(
     const scoped_refptr<StreamParserBuffer>& preroll_buffer) {
-  DCHECK(!preroll_buffer_);
+  DCHECK(!preroll_buffer_.get());
   DCHECK(!end_of_stream());
   DCHECK(!preroll_buffer->end_of_stream());
-  DCHECK(!preroll_buffer->preroll_buffer_);
+  DCHECK(!preroll_buffer->preroll_buffer_.get());
   DCHECK(preroll_buffer->splice_timestamp() == kNoTimestamp());
   DCHECK(preroll_buffer->splice_buffers().empty());
   DCHECK(preroll_buffer->timestamp() <= timestamp());
@@ -191,7 +191,7 @@ void StreamParserBuffer::SetPrerollBuffer(
 
 void StreamParserBuffer::set_timestamp(base::TimeDelta timestamp) {
   DecoderBuffer::set_timestamp(timestamp);
-  if (preroll_buffer_)
+  if (preroll_buffer_.get())
     preroll_buffer_->set_timestamp(timestamp);
 }
 
diff --git a/media/base/stream_parser_unittest.cc b/media/base/stream_parser_unittest.cc
index 708747c..2219dd1 100644
--- a/media/base/stream_parser_unittest.cc
+++ b/media/base/stream_parser_unittest.cc
@@ -129,7 +129,7 @@ class StreamParserTest : public testing::Test {
          ++itr) {
       if (itr != merged_buffers_.begin())
         results_stream << " ";
-      const StreamParserBuffer& buffer = *(*itr);
+      const StreamParserBuffer& buffer = *(itr->get());
       if (include_type_and_text_track) {
         switch (buffer.type()) {
           case DemuxerStream::AUDIO:
diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc
index c24a0a6..570907e 100644
--- a/media/base/text_renderer.cc
+++ b/media/base/text_renderer.cc
@@ -137,7 +137,7 @@ void TextRenderer::BufferReady(
   DCHECK_NE(status, DemuxerStream::kConfigChanged);
 
   if (status == DemuxerStream::kAborted) {
-    DCHECK(!input);
+    DCHECK(!input.get());
     DCHECK_GT(pending_read_count_, 0);
     DCHECK(pending_eos_set_.find(stream) != pending_eos_set_.end());
 
@@ -224,7 +224,7 @@ void TextRenderer::CueReady(
 
   switch (state_) {
     case kPlaying: {
-      if (text_cue)
+      if (text_cue.get())
         break;
 
       const size_t count = pending_eos_set_.erase(text_stream);
@@ -241,7 +241,7 @@ void TextRenderer::CueReady(
       return;
     }
     case kPausePending: {
-      if (text_cue)
+      if (text_cue.get())
         break;
 
       const size_t count = pending_eos_set_.erase(text_stream);
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index c77dc13..7064954 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -426,7 +426,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateTransparentFrame(
   const base::TimeDelta kZero;
   scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame(
       VideoFrame::YV12A, size, gfx::Rect(size), size, kZero);
-  FillYUVA(frame, kBlackY, kBlackUV, kBlackUV, kTransparentA);
+  FillYUVA(frame.get(), kBlackY, kBlackUV, kBlackUV, kTransparentA);
   return frame;
 }
 
diff --git a/media/base/video_frame_pool.cc b/media/base/video_frame_pool.cc
index 800d047..88308e9 100644
--- a/media/base/video_frame_pool.cc
+++ b/media/base/video_frame_pool.cc
@@ -66,7 +66,7 @@ scoped_refptr<VideoFrame> VideoFramePool::PoolImpl::CreateFrame(
 
   scoped_refptr<VideoFrame> frame;
 
-  while (!frame && !frames_.empty()) {
+  while (!frame.get() && !frames_.empty()) {
       scoped_refptr<VideoFrame> pool_frame = frames_.front();
       frames_.pop_front();
 
@@ -80,7 +80,7 @@ scoped_refptr<VideoFrame> VideoFramePool::PoolImpl::CreateFrame(
       }
   }
 
-  if (!frame) {
+  if (!frame.get()) {
     frame = VideoFrame::CreateFrame(
         format, coded_size, visible_rect, natural_size, timestamp);
   }