Revert 96974 - Remove mock_ffmpeg and update media unittests.

media/video/ffmpeg_video_decode_engine.h

 // Copyright (c) 2011 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_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
 #define MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_
 
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
   virtual void Initialize(MessageLoop* message_loop,
                           VideoDecodeEngine::EventHandler* event_handler,
                           VideoDecodeContext* context,
                           const VideoDecoderConfig& config);
   virtual void ConsumeVideoSample(scoped_refptr<Buffer> buffer);
   virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> frame);
   virtual void Uninitialize();
   virtual void Flush();
   virtual void Seek();
 
+  VideoFrame::Format GetSurfaceFormat() const;
+
  private:
   void DecodeFrame(scoped_refptr<Buffer> buffer);
   void ReadInput();
   void TryToFinishPendingFlush();
 
   AVCodecContext* codec_context_;
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> av_frame_;
   VideoDecodeEngine::EventHandler* event_handler_;
 
   // Frame rate of the video.
@@ skipping 18 matching lines @@
 
   // Whether flush operation is pending.
   bool flush_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecodeEngine);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_FFMPEG_VIDEO_DECODE_ENGINE_H_