Revert r180578, r180591, and r180604 from 1410 branch.

content/renderer/media/rtc_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 "content/renderer/media/rtc_video_decoder.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 171 matching lines @@
   }
 
   virtual ~RTCVideoDecoderTest() {
   }
 
   virtual void SetUp() OVERRIDE {
     video_track_ = MockVideoTrack::Create();
     decoder_ = new RTCVideoDecoder(message_loop_.message_loop_proxy(),
                                    message_loop_.message_loop_proxy(),
                                    video_track_);
+    renderer_ = new MockVideoRenderer();
     read_cb_ = base::Bind(&RTCVideoDecoderTest::FrameReady,
                           base::Unretained(this));
 
     DCHECK(decoder_);
 
     EXPECT_CALL(statistics_cb_, OnStatistics(_))
         .Times(AnyNumber());
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 27 matching lines @@
     NullVideoFrame video_frame;
     decoder_->RenderFrame(&video_frame);
   }
 
   MOCK_METHOD2(FrameReady, void(media::VideoDecoder::Status status,
                                 const scoped_refptr<media::VideoFrame>&));
 
   // Fixture members.
   scoped_refptr<MockVideoTrack> video_track_;
   scoped_refptr<RTCVideoDecoder> decoder_;
+  scoped_refptr<MockVideoRenderer> renderer_;
   MockStatisticsCB statistics_cb_;
   MessageLoop message_loop_;
   media::VideoDecoder::ReadCB read_cb_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoderTest);
 };
 
 const int RTCVideoDecoderTest::kWidth = 640;
 const int RTCVideoDecoderTest::kHeight = 480;
@@ skipping 80 matching lines @@
   Stop();
 
   // Any read after stopping should be immediately satisfied.
   EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
                                 scoped_refptr<media::VideoFrame>()));
   decoder_->Read(read_cb_);
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace content