Move VideoDecoder initialization into VideoRendererBase.

media/base/pipeline.h

Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index 965ddbd2038f1dea9802d243ad00a2b114b9bd3b..91b6c5ea958d7e7154b161e91e723c9dee5d8c0e 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -31,7 +31,6 @@ class AudioDecoder;
 class Clock;
 class FilterCollection;
 class MediaLog;
-class VideoDecoder;
 class VideoRenderer;
 
 // Adapter for using asynchronous Pipeline methods in code that wants to run
@@ -214,7 +213,6 @@ class MEDIA_EXPORT Pipeline
     kInitDemuxer,
     kInitAudioDecoder,
     kInitAudioRenderer,
-    kInitVideoDecoder,
     kInitVideoRenderer,
     kPausing,
     kSeeking,
@@ -352,16 +350,16 @@ class MEDIA_EXPORT Pipeline
 
   // Returns true if the asynchronous action of creating decoder has started.
   // Returns false if this method did nothing because the corresponding
-  // audio/video stream does not exist.
+  // audio stream does not exist.
   bool InitializeAudioDecoder(const scoped_refptr<Demuxer>& demuxer);
-  bool InitializeVideoDecoder(const scoped_refptr<Demuxer>& demuxer);
 
   // Initializes a renderer and connects it with decoder. Returns true if the
   // asynchronous action of creating renderer has started. Returns
   // false if this method did nothing because the corresponding audio/video
   // stream does not exist.
   bool InitializeAudioRenderer(const scoped_refptr<AudioDecoder>& decoder);
-  bool InitializeVideoRenderer(const scoped_refptr<VideoDecoder>& decoder);
+  bool InitializeVideoRenderer(
+      const scoped_refptr<DemuxerStream>& stream);
 
   // Kicks off destroying filters. Called by StopTask() and ErrorChangedTask().
   // When we start to tear down the pipeline, we will consider two cases:
@@ -496,17 +494,16 @@ class MEDIA_EXPORT Pipeline
   PipelineStatusCB ended_cb_;
   PipelineStatusCB error_cb_;
 
-  // Decoder reference used for signalling imminent shutdown.
-  // This is a HACK necessary because WebMediaPlayerImpl::Destroy() holds the
-  // renderer thread loop hostage for until PipelineImpl::Stop() calls its
-  // callback.
-  // This reference should only be used for this hack and no other purposes.
-  // http://crbug.com/110228 tracks removing this hack.
-  scoped_refptr<VideoDecoder> video_decoder_;
-
-  // Renderer references used for setting the volume and determining
+  // Audio renderer reference used for setting the volume and determining
   // when playback has finished.
   scoped_refptr<AudioRenderer> audio_renderer_;
+
+  // Video Renderer reference used for determining when playback has finished

[scherkus (not reviewing), 2012/08/14 22:00:24]

this TODO isn't really applicable in this context anymore as we won't be
removing the video_renderer_ reference after that bug is fixed

I'd rather see this TODO by the ShutdownHack() method call / declaration

[acolwell GONE FROM CHROMIUM, 2012/08/15 21:36:57]

Ami asked me to keep the comment here
http://codereview.chromium.org/10836167/diff/7005/media/base/pipeline.h#newco...

+  // and for signalling imminent shutdown.
+  // The signalling imminent shutdown is a HACK necessary because
+  // WebMediaPlayerImpl::Destroy() holds the render thread loop hostage
+  // until PipelineImpl::Stop() calls its callback.
+  // http://crbug.com/110228 tracks removing this hack.
   scoped_refptr<VideoRenderer> video_renderer_;
 
   // Demuxer reference used for setting the preload value.