Manual fixups in media code for scoped_refptr operator T* removal.

BUG=110610

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

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

content/renderer/media/media_stream_audio_source.h

@@ -32,7 +32,7 @@ class CONTENT_EXPORT MediaStreamAudioSource
     local_audio_source_ = source;
   }
 
-  void SetAudioCapturer(WebRtcAudioCapturer* capturer) {
+  void SetAudioCapturer(const scoped_refptr<WebRtcAudioCapturer>& capturer) {
     DCHECK(!audio_capturer_.get());
     audio_capturer_ = capturer;
   }

content/renderer/media/media_stream_track.cc

@@ -18,10 +18,9 @@ MediaStreamTrack* MediaStreamTrack::GetTrack(
 }
 
 MediaStreamTrack::MediaStreamTrack(
-    webrtc::MediaStreamTrackInterface* track, bool is_local_track)
-    : track_(track),
-      muted_state_(false),
-      is_local_track_(is_local_track){
+    const scoped_refptr<webrtc::MediaStreamTrackInterface>& track,
+    bool is_local_track)
+    : track_(track), muted_state_(false), is_local_track_(is_local_track) {
 }
 
 MediaStreamTrack::~MediaStreamTrack() {

content/renderer/media/media_stream_track.h

@@ -25,8 +25,9 @@ namespace content {
 class CONTENT_EXPORT MediaStreamTrack
     : NON_EXPORTED_BASE(public blink::WebMediaStreamTrack::ExtraData) {
  public:
-  MediaStreamTrack(webrtc::MediaStreamTrackInterface* track,
-                   bool is_local_track);
+  MediaStreamTrack(
+      const scoped_refptr<webrtc::MediaStreamTrackInterface>& track,
+      bool is_local_track);
   virtual ~MediaStreamTrack();
 
   static MediaStreamTrack* GetTrack(

content/renderer/media/media_stream_video_track.cc

@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 
 namespace content {
 

content/renderer/media/video_frame_compositor_unittest.cc

@@ -69,7 +69,7 @@ class VideoFrameCompositorTest : public testing::Test,
 };
 
 TEST_F(VideoFrameCompositorTest, InitialValues) {
-  EXPECT_FALSE(compositor()->GetCurrentFrame());
+  EXPECT_FALSE(compositor()->GetCurrentFrame().get());
 }
 
 TEST_F(VideoFrameCompositorTest, UpdateCurrentFrame) {

content/renderer/media/webmediaplayer_impl.cc

@@ -170,7 +170,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       chunk_demuxer_(NULL),
       // Threaded compositing isn't enabled universally yet.
       compositor_task_runner_(
-          RenderThreadImpl::current()->compositor_message_loop_proxy()
+          RenderThreadImpl::current()->compositor_message_loop_proxy().get()
               ? RenderThreadImpl::current()->compositor_message_loop_proxy()
               : base::MessageLoopProxy::current()),
       compositor_(new VideoFrameCompositor(

content/renderer/media/webrtc_audio_renderer_unittest.cc

@@ -90,7 +90,7 @@ class WebRtcAudioRendererTest : public testing::Test {
         stream_(new rtc::RefCountedObject<MockMediaStream>("label")),
         renderer_(new WebRtcAudioRenderer(stream_, 1, 1, 1, 44100, 441)) {
     EXPECT_CALL(*factory_.get(), CreateOutputDevice(1))
-        .WillOnce(Return(mock_output_device_));
+        .WillOnce(Return(mock_output_device_.get()));
     EXPECT_CALL(*mock_output_device_.get(), Start());
     EXPECT_TRUE(renderer_->Initialize(source_.get()));
     renderer_proxy_ = renderer_->CreateSharedAudioRendererProxy(stream_);

media/filters/skcanvas_video_renderer_unittest.cc

@@ -243,29 +243,31 @@ TEST_F(SkCanvasVideoRendererTest, NoFrame) {
 
 TEST_F(SkCanvasVideoRendererTest, TransparentFrame) {
   FillCanvas(target_canvas(), SK_ColorRED);
-  PaintRotated(VideoFrame::CreateTransparentFrame(gfx::Size(kWidth, kHeight)),
-               target_canvas(),
-               kNone,
-               SkXfermode::kSrcOver_Mode,
-               VIDEO_ROTATION_0);
+  PaintRotated(
+      VideoFrame::CreateTransparentFrame(gfx::Size(kWidth, kHeight)).get(),
+      target_canvas(),
+      kNone,
+      SkXfermode::kSrcOver_Mode,
+      VIDEO_ROTATION_0);
   EXPECT_EQ(static_cast<SkColor>(SK_ColorRED), GetColor(target_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, TransparentFrameSrcMode) {
   FillCanvas(target_canvas(), SK_ColorRED);
   // SRC mode completely overwrites the buffer.
-  PaintRotated(VideoFrame::CreateTransparentFrame(gfx::Size(kWidth, kHeight)),
-               target_canvas(),
-               kNone,
-               SkXfermode::kSrc_Mode,
-               VIDEO_ROTATION_0);
+  PaintRotated(
+      VideoFrame::CreateTransparentFrame(gfx::Size(kWidth, kHeight)).get(),
+      target_canvas(),
+      kNone,
+      SkXfermode::kSrc_Mode,
+      VIDEO_ROTATION_0);
   EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
             GetColor(target_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, CopyTransparentFrame) {
   FillCanvas(target_canvas(), SK_ColorRED);
-  Copy(VideoFrame::CreateTransparentFrame(gfx::Size(kWidth, kHeight)),
+  Copy(VideoFrame::CreateTransparentFrame(gfx::Size(kWidth, kHeight)).get(),
        target_canvas());
   EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
             GetColor(target_canvas()));