Remove implicit scoped_refptr operator T*

media/filters/ffmpeg_demuxer.cc

Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index af2a7826bc5faa6d56ff131407f8eda5a2b2a6d9..761e4bc1f63d20e4ed1ccb1676fa840aa0add426 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -333,7 +333,7 @@ scoped_refptr<FFmpegDemuxerStream> FFmpegDemuxer::GetFFmpegStream(
     DemuxerStream::Type type) const {
   StreamVector::const_iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
-    if (*iter && (*iter)->type() == type) {
+    if (*iter.get() && (*iter)->type() == type) {
       return *iter;
     }
   }
@@ -577,7 +577,7 @@ void FFmpegDemuxer::SeekTask(base::TimeDelta time, const PipelineStatusCB& cb) {
   // Tell streams to flush buffers due to seeking.
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
-    if (*iter)
+    if (*iter.get())
       (*iter)->FlushBuffers();
   }
 
@@ -617,7 +617,7 @@ void FFmpegDemuxer::DemuxTask() {
       for (StreamVector::iterator iter = streams_.begin();
            iter != streams_.end();
            ++iter) {
-        if (*iter && (*iter)->type() == DemuxerStream::AUDIO) {
+        if (*iter.get() && (*iter)->type() == DemuxerStream::AUDIO) {
           base::TimeDelta duration = (*iter)->GetElapsedTime();
           if (duration != kNoTimestamp() && duration > base::TimeDelta()) {
             host_->SetDuration(duration);
@@ -643,10 +643,10 @@ void FFmpegDemuxer::DemuxTask() {
   // Defend against ffmpeg giving us a bad stream index.
   if (packet->stream_index >= 0 &&
       packet->stream_index < static_cast<int>(streams_.size()) &&
-      streams_[packet->stream_index] &&
+      streams_[packet->stream_index].get() &&
       (!audio_disabled_ ||
        streams_[packet->stream_index]->type() != DemuxerStream::AUDIO)) {
-    FFmpegDemuxerStream* demuxer_stream = streams_[packet->stream_index];
+    FFmpegDemuxerStream* demuxer_stream = streams_[packet->stream_index].get();
     demuxer_stream->EnqueuePacket(packet.Pass());
   }
 
@@ -661,10 +661,10 @@ void FFmpegDemuxer::StopTask(const base::Closure& callback) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
-    if (*iter)
+    if (*iter.get())
       (*iter)->Stop();
   }
-  if (data_source_) {
+  if (data_source_.get()) {
     data_source_->Stop(callback);
   } else {
     callback.Run();
@@ -676,7 +676,7 @@ void FFmpegDemuxer::DisableAudioStreamTask() {
   audio_disabled_ = true;
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
-    if (*iter && (*iter)->type() == DemuxerStream::AUDIO) {
+    if (*iter.get() && (*iter)->type() == DemuxerStream::AUDIO) {
       (*iter)->Stop();
     }
   }
@@ -686,7 +686,7 @@ bool FFmpegDemuxer::StreamsHavePendingReads() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
-    if (*iter && (*iter)->HasPendingReads()) {
+    if (*iter.get() && (*iter)->HasPendingReads()) {
       return true;
     }
   }
@@ -697,7 +697,7 @@ void FFmpegDemuxer::StreamHasEnded() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
-    if (!*iter ||
+    if (!*iter.get() ||
         (audio_disabled_ && (*iter)->type() == DemuxerStream::AUDIO)) {
       continue;
     }
@@ -723,12 +723,12 @@ void FFmpegDemuxer::NotifyBufferingChanged() {
       audio_disabled_ ? NULL : GetFFmpegStream(DemuxerStream::AUDIO);
   scoped_refptr<FFmpegDemuxerStream> video =
       GetFFmpegStream(DemuxerStream::VIDEO);
-  if (audio && video) {
+  if (audio.get() && video.get()) {
     buffered = audio->GetBufferedRanges().IntersectionWith(
         video->GetBufferedRanges());
-  } else if (audio) {
+  } else if (audio.get()) {
     buffered = audio->GetBufferedRanges();
-  } else if (video) {
+  } else if (video.get()) {
     buffered = video->GetBufferedRanges();
   }
   for (size_t i = 0; i < buffered.size(); ++i)