Reland: Remove reference counting from media::VideoDecoder and friends.

media/filters/ffmpeg_video_decoder_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 <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop.h"
 #include "base/memory/singleton.h"
@@ skipping 32 matching lines @@
 static const gfx::Rect kInitVisibleRect(100, 100);
 static const gfx::Size kInitNaturalSize(100, 100);
 
 ACTION_P(ReturnBuffer, buffer) {
   arg0.Run(buffer ? DemuxerStream::kOk : DemuxerStream::kAborted, buffer);
 }
 
 class FFmpegVideoDecoderTest : public testing::Test {
  public:
   FFmpegVideoDecoderTest()
-      : decoder_(NULL),
+      : decoder_(new FFmpegVideoDecoder(message_loop_.message_loop_proxy())),
         demuxer_(new StrictMock<MockDemuxerStream>()),
         read_cb_(base::Bind(&FFmpegVideoDecoderTest::FrameReady,
                             base::Unretained(this))) {
     FFmpegGlue::InitializeFFmpeg();
 
-    decoder_ = new FFmpegVideoDecoder(message_loop_.message_loop_proxy());
-
     // Initialize various test buffers.
     frame_buffer_.reset(new uint8[kCodedSize.GetArea()]);
     end_of_stream_buffer_ = DecoderBuffer::CreateEOSBuffer();
     i_frame_buffer_ = ReadTestDataFile("vp8-I-frame-320x240");
     corrupt_i_frame_buffer_ = ReadTestDataFile("vp8-corrupt-I-frame");
   }
 
   virtual ~FFmpegVideoDecoderTest() {
     Stop();
   }
@@ skipping 123 matching lines @@
 
     decoder_->Read(read_cb_);
 
     message_loop_.RunUntilIdle();
   }
 
   MOCK_METHOD2(FrameReady, void(VideoDecoder::Status,
                                 const scoped_refptr<VideoFrame>&));
 
   MessageLoop message_loop_;
-  scoped_refptr<FFmpegVideoDecoder> decoder_;
+  scoped_ptr<FFmpegVideoDecoder> decoder_;
   scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_;
   MockStatisticsCB statistics_cb_;
   VideoDecoderConfig config_;
 
   VideoDecoder::ReadCB read_cb_;
 
   // Various buffers for testing.
   scoped_ptr<uint8_t[]> frame_buffer_;
   scoped_refptr<DecoderBuffer> end_of_stream_buffer_;
   scoped_refptr<DecoderBuffer> i_frame_buffer_;
@@ skipping 447 matching lines @@
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(invalid_config));
   EXPECT_CALL(*this, FrameReady(VideoDecoder::kDecodeError, IsNull()));
 
   // Signal a config change.
   base::ResetAndReturn(&read_cb).Run(DemuxerStream::kConfigChanged, NULL);
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace media