Remove AudioDecoder from the Filter heirarchy.

media/base/pipeline.cc

Index: media/base/pipeline.cc
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index 0f268c967efeb3f2759af823991d92d0adec412e..8d38b4d7c2b307f02c52149ede41f50f314f76c8 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -54,8 +54,7 @@ media::PipelineStatus PipelineStatusNotification::status() {
   return status_;
 }
 
-class Pipeline::PipelineInitState {
- public:
+struct Pipeline::PipelineInitState {
   scoped_refptr<AudioDecoder> audio_decoder_;

[scherkus (not reviewing), 2012/02/06 21:04:04]

nit: drop trailing _ for structs

[Ami GONE FROM CHROMIUM, 2012/02/06 21:38:48]

Done.

   scoped_refptr<VideoDecoder> video_decoder_;
   scoped_refptr<CompositeFilter> composite_;
@@ -1029,7 +1028,7 @@ void Pipeline::FilterStateTransitionTask() {
 
     // Start monitoring rate of downloading.
     int bitrate = 0;
-    if (demuxer_.get()) {
+    if (demuxer_) {
       bitrate = demuxer_->GetBitrate();
       local_source_ = demuxer_->IsLocalSource();
       streaming_ = !demuxer_->IsSeekable();
@@ -1171,19 +1170,14 @@ bool Pipeline::InitializeAudioDecoder(
   if (!stream)
     return false;
 
-  scoped_refptr<AudioDecoder> audio_decoder;
-  filter_collection_->SelectAudioDecoder(&audio_decoder);
+  filter_collection_->SelectAudioDecoder(&pipeline_init_state_->audio_decoder_);
 
-  if (!audio_decoder) {
+  if (!pipeline_init_state_->audio_decoder_) {
     SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
     return false;
   }
 
-  if (!PrepareFilter(audio_decoder))
-    return false;
-
-  pipeline_init_state_->audio_decoder_ = audio_decoder;
-  audio_decoder->Initialize(
+  pipeline_init_state_->audio_decoder_->Initialize(
       stream,
       base::Bind(&Pipeline::OnFilterInitialize, this),
       base::Bind(&Pipeline::OnUpdateStatistics, this));