Revert r180578, r180591, and r180604 from 1410 branch.

media/base/pipeline_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/simple_thread.h"
@@ skipping 73 matching lines @@
     demuxer_ = new MockDemuxer();
     filter_collection_->SetDemuxer(demuxer_);
 
     video_decoder_ = new MockVideoDecoder();
     filter_collection_->GetVideoDecoders()->push_back(video_decoder_);
 
     audio_decoder_ = new MockAudioDecoder();
     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.
     DemuxerStream* null_pointer = NULL;
     EXPECT_CALL(*demuxer_, GetStream(_))
         .WillRepeatedly(Return(null_pointer));
 
     EXPECT_CALL(*demuxer_, GetStartTime())
         .WillRepeatedly(Return(base::TimeDelta()));
   }
@@ skipping 184 matching lines @@
 
   // Fixture members.
   StrictMock<CallbackHelper> callbacks_;
   MessageLoop message_loop_;
   scoped_refptr<Pipeline> pipeline_;
 
   scoped_ptr<FilterCollection> filter_collection_;
   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_;
   VideoDecoderConfig video_decoder_config_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PipelineTest);
 };
 
 // Test that playback controls methods no-op when the pipeline hasn't been
@@ skipping 907 matching lines @@
 INSTANTIATE_TEARDOWN_TEST(Error, InitAudioRenderer);
 INSTANTIATE_TEARDOWN_TEST(Error, InitVideoRenderer);
 INSTANTIATE_TEARDOWN_TEST(Error, Pausing);
 INSTANTIATE_TEARDOWN_TEST(Error, Flushing);
 INSTANTIATE_TEARDOWN_TEST(Error, Seeking);
 INSTANTIATE_TEARDOWN_TEST(Error, Prerolling);
 INSTANTIATE_TEARDOWN_TEST(Error, Starting);
 INSTANTIATE_TEARDOWN_TEST(Error, Playing);
 
 }  // namespace media