Move AudioDecoder initialization into AudioRenderer.

media/base/pipeline.h

Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index e023e87224a4214539497055380e1c3fc2553c35..4e0e7e98683fd4885650b53c3662c6ffd5314479 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -11,7 +11,6 @@
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "media/base/audio_renderer.h"
 #include "media/base/demuxer.h"
 #include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
@@ -28,7 +27,7 @@ class TimeDelta;
 
 namespace media {
 
-class AudioDecoder;
+class AudioRenderer;
 class Clock;
 class FilterCollection;
 class MediaLog;
@@ -232,7 +231,6 @@ class MEDIA_EXPORT Pipeline
   enum State {
     kCreated,
     kInitDemuxer,
-    kInitAudioDecoder,
     kInitAudioRenderer,
     kInitVideoRenderer,
     kInitPrerolling,
@@ -323,7 +321,6 @@ class MEDIA_EXPORT Pipeline
   // Kicks off initialization for each media object, executing |done_cb| with
   // the result when completed.
   void InitializeDemuxer(const PipelineStatusCB& done_cb);
-  void InitializeAudioDecoder(const PipelineStatusCB& done_cb);
   void InitializeAudioRenderer(const PipelineStatusCB& done_cb);
   void InitializeVideoRenderer(const PipelineStatusCB& done_cb);
 
@@ -467,12 +464,6 @@ class MEDIA_EXPORT Pipeline
   // Demuxer reference used for setting the preload value.
   scoped_refptr<Demuxer> demuxer_;
 
-  // Audio decoder reference used during initialization.
-  //
-  // TODO(scherkus): Remove after renderers do initialization, see
-  // http://crbug.com/145635
-  scoped_refptr<AudioDecoder> audio_decoder_;
-
   PipelineStatistics statistics_;
 
   // Time of pipeline creation; is non-zero only until the pipeline first