Revert "Speculative revert by sheriff"

media/mojo/services/mojo_renderer_service.cc

Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index 7b6884d93b753b2c0e03a156031f1ab574ec6505..0601c2c461e90364a55eec1a003aa974b5b74e95 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -14,6 +14,7 @@
 #include "media/base/decryptor.h"
 #include "media/base/media_log.h"
 #include "media/base/video_renderer.h"
+#include "media/base/video_renderer_sink.h"
 #include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/renderer_config.h"
 #include "media/renderers/audio_renderer_impl.h"
@@ -25,9 +26,6 @@ namespace media {
 // Time interval to update media time.
 const int kTimeUpdateIntervalMs = 50;
 
-static void PaintNothing(const scoped_refptr<VideoFrame>& frame) {
-}
-
 MojoRendererService::MojoRendererService()
     : state_(STATE_UNINITIALIZED),
       last_media_time_usec_(0),
@@ -40,6 +38,7 @@ MojoRendererService::MojoRendererService()
   scoped_refptr<MediaLog> media_log(new MediaLog());
   RendererConfig* renderer_config = RendererConfig::Get();
   audio_renderer_sink_ = renderer_config->GetAudioRendererSink();
+  video_renderer_sink_ = renderer_config->GetVideoRendererSink();
 
   scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
       task_runner, audio_renderer_sink_.get(),
@@ -49,7 +48,7 @@ MojoRendererService::MojoRendererService()
       renderer_config->GetAudioHardwareConfig(), media_log));
 
   scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
-      task_runner,
+      task_runner, video_renderer_sink_.get(),
       renderer_config->GetVideoDecoders(task_runner,
                                         base::Bind(&MediaLog::AddLogEvent,
                                                    media_log)).Pass(),
@@ -113,7 +112,6 @@ void MojoRendererService::OnStreamReady(const mojo::Closure& callback) {
           &MojoRendererService::OnRendererInitializeDone, weak_this_, callback),
       base::Bind(&MojoRendererService::OnUpdateStatistics, weak_this_),
       base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_),
-      base::Bind(&PaintNothing),
       base::Bind(&MojoRendererService::OnRendererEnded, weak_this_),
       base::Bind(&MojoRendererService::OnError, weak_this_),
       base::Bind(base::DoNothing));