Revert r180578, r180591, and r180604 from 1410 branch.

media/base/pipeline_unittest.cc

Index: media/base/pipeline_unittest.cc
===================================================================
--- media/base/pipeline_unittest.cc	(revision 182591)
+++ media/base/pipeline_unittest.cc	(working copy)
@@ -91,12 +91,10 @@
     filter_collection_->GetAudioDecoders()->push_back(audio_decoder_);
 
     video_renderer_ = new MockVideoRenderer();
-    scoped_ptr<VideoRenderer> video_renderer(video_renderer_);
-    filter_collection_->SetVideoRenderer(video_renderer.Pass());
+    filter_collection_->AddVideoRenderer(video_renderer_);
 
     audio_renderer_ = new MockAudioRenderer();
-    scoped_ptr<AudioRenderer> audio_renderer(audio_renderer_);
-    filter_collection_->SetAudioRenderer(audio_renderer.Pass());
+    filter_collection_->AddAudioRenderer(audio_renderer_);
 
     // InitializeDemuxer() adds overriding expectations for expected non-NULL
     // streams.
@@ -301,8 +299,8 @@
   scoped_refptr<MockDemuxer> demuxer_;
   scoped_refptr<MockVideoDecoder> video_decoder_;
   scoped_refptr<MockAudioDecoder> audio_decoder_;
-  MockVideoRenderer* video_renderer_;
-  MockAudioRenderer* audio_renderer_;
+  scoped_refptr<MockVideoRenderer> video_renderer_;
+  scoped_refptr<MockAudioRenderer> audio_renderer_;
   scoped_refptr<StrictMock<MockDemuxerStream> > audio_stream_;
   scoped_refptr<StrictMock<MockDemuxerStream> > video_stream_;
   AudioRenderer::TimeCB audio_time_cb_;