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 25fec4101ddc57ffcb6caa3afa91b07661dfc96e..62efd7cff032c6a790e95d83009dd40732781c71 100644
--- a/chromecast/media/cma/filters/cma_renderer.h
+++ b/chromecast/media/cma/filters/cma_renderer.h
@@ -23,7 +23,6 @@ namespace media {
 class DemuxerStreamProvider;
 class TimeDeltaInterpolator;
 class VideoFrame;
-class VideoRendererSink;
 }
 
 namespace chromecast {
@@ -35,8 +34,7 @@ class VideoPipeline;
 
 class CmaRenderer : public ::media::Renderer {
  public:
-  CmaRenderer(scoped_ptr<MediaPipeline> media_pipeline,
-              ::media::VideoRendererSink* video_renderer_sink);
+  explicit CmaRenderer(scoped_ptr<MediaPipeline> media_pipeline);
   ~CmaRenderer() override;
 
   // ::media::Renderer implementation:
@@ -45,6 +43,7 @@ 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;
@@ -99,11 +98,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_;