Revert "Speculative revert by sheriff"

media/test/pipeline_integration_test_base.cc

Index: media/test/pipeline_integration_test_base.cc
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index da3a9f8555788a374b5f0441e91d5b12c3357b4a..c17431a5759f5a68c338bc35184e712cb411960a 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -26,6 +26,7 @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtMost;
+using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
 using ::testing::SaveArg;
 
@@ -34,6 +35,9 @@ namespace media {
 const char kNullVideoHash[] = "d41d8cd98f00b204e9800998ecf8427e";
 const char kNullAudioHash[] = "0.00,0.00,0.00,0.00,0.00,0.00,";
 
+MockVideoRendererSink::MockVideoRendererSink() {}
+MockVideoRendererSink::~MockVideoRendererSink() {}
+
 PipelineIntegrationTestBase::PipelineIntegrationTestBase()
     : hashing_enabled_(false),
       clockless_playback_(false),
@@ -135,8 +139,6 @@ PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
                  base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnBufferingStateChanged,
                  base::Unretained(this)),
-      base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
-                 base::Unretained(this)),
       base::Closure(), base::Bind(&PipelineIntegrationTestBase::OnAddTextTrack,
                                   base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnWaitingForDecryptionKey,
@@ -238,9 +240,13 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() {
       new FFmpegVideoDecoder(message_loop_.message_loop_proxy()));
 #endif
 
+  EXPECT_CALL(video_sink_, PaintFrameUsingOldRenderingPath(_))
+      .WillRepeatedly(
+          Invoke(this, &PipelineIntegrationTestBase::OnVideoFramePaint));
+
   // Disable frame dropping if hashing is enabled.
   scoped_ptr<VideoRenderer> video_renderer(
-      new VideoRendererImpl(message_loop_.message_loop_proxy(),
+      new VideoRendererImpl(message_loop_.message_loop_proxy(), &video_sink_,
                             video_decoders.Pass(), false, new MediaLog()));
 
   if (!clockless_playback_) {