media: Reland "Simplify {Audio|Video}Decoder initialization callback."

media/filters/ffmpeg_audio_decoder.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/callback.h"
@@ skipping 20 matching lines @@
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
   FFmpegAudioDecoder(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       const LogCB& log_cb);
   ~FFmpegAudioDecoder() override;
 
   // AudioDecoder implementation.
   std::string GetDisplayName() const override;
   void Initialize(const AudioDecoderConfig& config,
-                  const PipelineStatusCB& status_cb,
+                  const InitCB& init_cb,
                   const OutputCB& output_cb) override;
   void Decode(const scoped_refptr<DecoderBuffer>& buffer,
               const DecodeCB& decode_cb) override;
   void Reset(const base::Closure& closure) override;
 
  private:
   // There are four states the decoder can be in:
   //
   // - kUninitialized: The decoder is not initialized.
   // - kNormal: This is the normal state. The decoder is idle and ready to
@@ skipping 56 matching lines @@
   scoped_ptr<AudioDiscardHelper> discard_helper_;
 
   LogCB log_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_