Revert 276344 "Add callback in VideoDecoder and AudioDecoder to ..."

media/filters/decoder_stream.h

Index: media/filters/decoder_stream.h
===================================================================
--- media/filters/decoder_stream.h	(revision 277175)
+++ media/filters/decoder_stream.h	(working copy)
@@ -88,9 +88,6 @@
   // behavior.
   bool CanReadWithoutStalling() const;
 
-  // Returns maximum concurrent decode requests for the current |decoder_|.
-  int GetMaxDecodeRequests() const;
-
   // Returns true if one more decode request can be submitted to the decoder.
   bool CanDecodeMore() const;
 
@@ -144,11 +141,10 @@
   void FlushDecoder();
 
   // Callback for Decoder::Decode().
-  void OnDecodeDone(int buffer_size, bool end_of_stream, DecoderStatus status);
+  void OnDecodeOutputReady(int buffer_size,
+                           DecoderStatus status,
+                           const scoped_refptr<Output>& output);
 
-  // Output callback passed to Decoder::Initialize().
-  void OnDecodeOutputReady(const scoped_refptr<Output>& output);
-
   // Reads a buffer from |stream_| and returns the result via OnBufferReady().
   void ReadFromDemuxerStream();
 
@@ -212,7 +208,7 @@
 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const;
 
 template <>
-int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
+bool DecoderStream<DemuxerStream::AUDIO>::CanDecodeMore() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;