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 1d50f04e6495d49fb64c2f9742d04970905eadba..d486305530cd14c95c1eaaa829dc99a8827afc10 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
@@ -239,7 +238,6 @@ class MEDIA_EXPORT Pipeline
     kInitDemuxer,
     kInitAudioDecoder,
     kInitAudioRenderer,
-    kInitVideoDecoder,
     kInitVideoRenderer,
     kPausing,
     kSeeking,
@@ -387,14 +385,14 @@ class MEDIA_EXPORT Pipeline
   // Returns false if this method did nothing because the corresponding
   // audio/video stream does not exist.

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

drop "video"

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Done.

   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:
@@ -531,14 +529,6 @@ 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

[Ami GONE FROM CHROMIUM, 2012/08/09 20:30:18]

This comment is lying by omission; I think you want to move the HACK comment
that used to live right above here down to here (with a bit of massaging).

[acolwell GONE FROM CHROMIUM, 2012/08/09 22:23:32]

Done.

   // when playback has finished.
   scoped_refptr<AudioRenderer> audio_renderer_;