Revert "Speculative revert by sheriff"

chromecast/media/cma/filters/cma_renderer.h

Index: chromecast/media/cma/filters/cma_renderer.h
diff --git a/chromecast/media/cma/filters/cma_renderer.h b/chromecast/media/cma/filters/cma_renderer.h
index 62efd7cff032c6a790e95d83009dd40732781c71..25fec4101ddc57ffcb6caa3afa91b07661dfc96e 100644
--- a/chromecast/media/cma/filters/cma_renderer.h
+++ b/chromecast/media/cma/filters/cma_renderer.h
@@ -23,6 +23,7 @@ namespace media {
 class DemuxerStreamProvider;
 class TimeDeltaInterpolator;
 class VideoFrame;
+class VideoRendererSink;
 }
 
 namespace chromecast {
@@ -34,7 +35,8 @@ class VideoPipeline;
 
 class CmaRenderer : public ::media::Renderer {
  public:
-  explicit CmaRenderer(scoped_ptr<MediaPipeline> media_pipeline);
+  CmaRenderer(scoped_ptr<MediaPipeline> media_pipeline,
+              ::media::VideoRendererSink* video_renderer_sink);
   ~CmaRenderer() override;
 
   // ::media::Renderer implementation:
@@ -43,7 +45,6 @@ class CmaRenderer : public ::media::Renderer {
       const ::media::PipelineStatusCB& init_cb,
       const ::media::StatisticsCB& statistics_cb,
       const ::media::BufferingStateCB& buffering_state_cb,
-      const PaintCB& paint_cb,
       const base::Closure& ended_cb,
       const ::media::PipelineStatusCB& error_cb,
       const base::Closure& waiting_for_decryption_key_cb) override;
@@ -98,11 +99,11 @@ class CmaRenderer : public ::media::Renderer {
   scoped_ptr<MediaPipeline> media_pipeline_;
   AudioPipeline* audio_pipeline_;
   VideoPipeline* video_pipeline_;
+  ::media::VideoRendererSink* video_renderer_sink_;
 
   ::media::DemuxerStreamProvider* demuxer_stream_provider_;
 
   // Set of callbacks.
-  PaintCB paint_cb_;
   ::media::PipelineStatusCB init_cb_;
   ::media::StatisticsCB statistics_cb_;
   base::Closure ended_cb_;