Speculative revert by sheriff

media/mojo/services/mojo_renderer_service.cc

 // Copyright 2014 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 "media/mojo/services/mojo_renderer_service.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #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"
 #include "media/renderers/renderer_impl.h"
 #include "media/renderers/video_renderer_impl.h"
 
 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),
       weak_factory_(this) {
   weak_this_ = weak_factory_.GetWeakPtr();
   DVLOG(1) << __FUNCTION__;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner(
       base::MessageLoop::current()->task_runner());
   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(),
       renderer_config->GetAudioDecoders(task_runner,
                                         base::Bind(&MediaLog::AddLogEvent,
                                                    media_log)).Pass(),
       renderer_config->GetAudioHardwareConfig(), media_log));
 
   scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
-      task_runner, video_renderer_sink_.get(),
+      task_runner,
       renderer_config->GetVideoDecoders(task_runner,
                                         base::Bind(&MediaLog::AddLogEvent,
                                                    media_log)).Pass(),
       true, media_log));
 
   // Create renderer.
   renderer_.reset(new RendererImpl(
       task_runner, audio_renderer.Pass(), video_renderer.Pass()));
 }
 
@@ skipping 43 matching lines @@
 
 void MojoRendererService::OnStreamReady(const mojo::Closure& callback) {
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   renderer_->Initialize(
       stream_provider_.get(),
       base::Bind(
           &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));
 }
 
 void MojoRendererService::OnRendererInitializeDone(
     const mojo::Closure& callback, PipelineStatus status) {
   DVLOG(1) << __FUNCTION__;
 
   if (status != PIPELINE_OK && state_ != STATE_ERROR)
@@ skipping 54 matching lines @@
 }
 
 void MojoRendererService::OnFlushCompleted(const mojo::Closure& callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_FLUSHING);
   state_ = STATE_PLAYING;
   callback.Run();
 }
 
 }  // namespace media