Revert "Speculative revert by sheriff"

media/renderers/default_renderer_factory.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/renderers/default_renderer_factory.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/base/media_log.h"
@@ skipping 20 matching lines @@
       gpu_factories_(gpu_factories),
       audio_hardware_config_(audio_hardware_config) {
 }
 
 DefaultRendererFactory::~DefaultRendererFactory() {
 }
 
 // TODO(xhwang): Use RendererConfig to customize what decoders we use.
 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
-    AudioRendererSink* audio_renderer_sink) {
+    AudioRendererSink* audio_renderer_sink,
+    VideoRendererSink* video_renderer_sink) {
   DCHECK(audio_renderer_sink);
 
   // Create our audio decoders and renderer.
   ScopedVector<AudioDecoder> audio_decoders;
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
   audio_decoders.push_back(new FFmpegAudioDecoder(
       media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_)));
 #endif
 
@@ skipping 16 matching lines @@
     video_decoders.push_back(new GpuVideoDecoder(gpu_factories_));
 
 #if !defined(MEDIA_DISABLE_LIBVPX)
   video_decoders.push_back(new VpxVideoDecoder(media_task_runner));
 #endif
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
   video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner));
 #endif
 
-  scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
-      media_task_runner, video_decoders.Pass(), true, media_log_));
+  scoped_ptr<VideoRenderer> video_renderer(
+      new VideoRendererImpl(media_task_runner, video_renderer_sink,
+                            video_decoders.Pass(), true, media_log_));
 
   // Create renderer.
   return scoped_ptr<Renderer>(new RendererImpl(
       media_task_runner, audio_renderer.Pass(), video_renderer.Pass()));
 }
 
 }  // namespace media