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

media/filters/decoder_stream.h

Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index e5b0cfcea53f885c254a248643cd5ff6c7e45d53..ce29ac086da2bb33b1ee7fb216910da61b838fc2 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -36,7 +36,6 @@ class MEDIA_EXPORT DecoderStream {
   typedef DecoderStreamTraits<StreamType> StreamTraits;
   typedef typename StreamTraits::DecoderType Decoder;
   typedef typename StreamTraits::OutputType Output;
-  typedef typename StreamTraits::StreamInitCB InitCB;
   typedef typename Decoder::Status DecoderStatus;
 
   enum Status {
@@ -46,6 +45,9 @@ class MEDIA_EXPORT DecoderStream {
     DECODE_ERROR,  // Decoder returned decode error.
   };
 
+  // Indicates completion of a DecoderStream initialization.
+  typedef base::Callback<void(bool success)> InitCB;
+
   // Indicates completion of a DecoderStream read.
   typedef base::Callback<void(Status, const scoped_refptr<Output>&)> ReadCB;
 
@@ -155,7 +157,7 @@ class MEDIA_EXPORT DecoderStream {
   void ReinitializeDecoder();
 
   // Callback for Decoder reinitialization.
-  void OnDecoderReinitialized(PipelineStatus status);
+  void OnDecoderReinitialized(bool success);
 
   void CompleteDecoderReinitialization(bool success);