Remove mock_ffmpeg and update media unittests.

media/filters/ffmpeg_video_decoder_unittest.cc

Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 7614d8b71591e277916dfe9c85675c9ba8f3b87a..d6e6d704f7072e3201f8a1731b30f9c49f0c3f86 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -5,12 +5,14 @@
 #include <deque>
 
 #include "base/bind.h"
+#include "base/file_util.h"
 #include "base/memory/singleton.h"
+#include "base/path_service.h"
 #include "base/string_util.h"
 #include "media/base/data_buffer.h"
 #include "media/base/filters.h"
+#include "media/base/media.h"
 #include "media/base/mock_callback.h"
-#include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
 #include "media/base/mock_task.h"
@@ -136,6 +138,10 @@ ACTION_P(EngineSeek, engine) {
 class FFmpegVideoDecoderTest : public testing::Test {

[scherkus (not reviewing), 2011/08/11 01:26:29]

heh this test should probably use the real FFmpegVideoDecodeEngine :P

but that's for another day

[acolwell GONE FROM CHROMIUM, 2011/08/11 23:54:40]

yes... another day.

  protected:
   FFmpegVideoDecoderTest() {
+    FilePath file_path;
+    EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
+    InitializeMediaLibrary(file_path);

[scherkus (not reviewing), 2011/08/11 01:26:29]

ForTest() ?

[acolwell GONE FROM CHROMIUM, 2011/08/11 23:54:40]

Done.

+
     // Create an FFmpegVideoDecoder, and MockVideoDecodeEngine.
     //
     // TODO(ajwong): Break the test's dependency on FFmpegVideoDecoder.
@@ -220,7 +226,6 @@ class FFmpegVideoDecoderTest : public testing::Test {
   AVCodec codec_;
   AVFrame yuv_frame_;
   scoped_refptr<VideoFrame> video_frame_;
-  StrictMock<MockFFmpeg> mock_ffmpeg_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoderTest);