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

media/filters/fake_video_decoder.h

 // Copyright 2013 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_FAKE_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_
 
 #include <list>
 
 #include "base/bind.h"
@@ skipping 26 matching lines @@
   // count over all calls will be equal to total_bytes_decoded().
   FakeVideoDecoder(int decoding_delay,
                    int max_parallel_decoding_requests,
                    const BytesDecodedCB& bytes_decoded_cb);
   ~FakeVideoDecoder() override;
 
   // VideoDecoder implementation.
   std::string GetDisplayName() const override;
   void Initialize(const VideoDecoderConfig& config,
                   bool low_delay,
-                  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;
   int GetMaxDecodeRequests() const override;
 
   // Holds the next init/decode/reset callback from firing.
   void HoldNextInit();
   void HoldDecode();
   void HoldNextReset();
@@ skipping 36 matching lines @@
   void DoReset();
 
   base::ThreadChecker thread_checker_;
 
   const size_t decoding_delay_;
   const int max_parallel_decoding_requests_;
   BytesDecodedCB bytes_decoded_cb_;
 
   State state_;
 
-  CallbackHolder<PipelineStatusCB> init_cb_;
+  CallbackHolder<InitCB> init_cb_;
   CallbackHolder<base::Closure> reset_cb_;
 
   OutputCB output_cb_;
 
   bool hold_decode_;
   std::list<DecodeCB> held_decode_callbacks_;
 
   VideoDecoderConfig current_config_;
 
   std::list<scoped_refptr<VideoFrame> > decoded_frames_;
 
   int total_bytes_decoded_;
 
   bool fail_to_initialize_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<FakeVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FAKE_VIDEO_DECODER_H_