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

media/filters/fake_video_decoder.h

Index: media/filters/fake_video_decoder.h
===================================================================
--- media/filters/fake_video_decoder.h	(revision 277175)
+++ media/filters/fake_video_decoder.h	(working copy)
@@ -32,18 +32,19 @@
  public:
   // Constructs an object with a decoding delay of |decoding_delay| frames.
   FakeVideoDecoder(int decoding_delay,
+                   bool supports_get_decode_output,
                    int max_parallel_decoding_requests);
   virtual ~FakeVideoDecoder();
 
   // VideoDecoder implementation.
   virtual void Initialize(const VideoDecoderConfig& config,
                           bool low_delay,
-                          const PipelineStatusCB& status_cb,
-                          const OutputCB& output_cb) OVERRIDE;
+                          const PipelineStatusCB& status_cb) OVERRIDE;
   virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
                       const DecodeCB& decode_cb) OVERRIDE;
   virtual void Reset(const base::Closure& closure) OVERRIDE;
   virtual void Stop() OVERRIDE;
+  virtual scoped_refptr<VideoFrame> GetDecodeOutput() OVERRIDE;
   virtual int GetMaxDecodeRequests() const OVERRIDE;
 
   // Holds the next init/decode/reset callback from firing.
@@ -75,7 +76,8 @@
   // Callback for updating |total_bytes_decoded_|.
   void OnFrameDecoded(int buffer_size,
                       const DecodeCB& decode_cb,
-                      Status status);
+                      Status status,
+                      const scoped_refptr<VideoFrame>& video_frame);
 
   // Runs |decode_cb| or puts it to |held_decode_callbacks_| depending on
   // current value of |hold_decode_|.
@@ -89,6 +91,7 @@
   base::ThreadChecker thread_checker_;
 
   const size_t decoding_delay_;
+  const bool supports_get_decode_output_;
   const int max_parallel_decoding_requests_;
 
   State state_;
@@ -96,8 +99,6 @@
   CallbackHolder<PipelineStatusCB> init_cb_;
   CallbackHolder<base::Closure> reset_cb_;
 
-  OutputCB output_cb_;
-
   bool hold_decode_;
   std::list<DecodeCB> held_decode_callbacks_;