Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.

media/filters/ffmpeg_video_decode_engine_unittest.cc

Index: media/filters/ffmpeg_video_decode_engine_unittest.cc
diff --git a/media/filters/ffmpeg_video_decode_engine_unittest.cc b/media/filters/ffmpeg_video_decode_engine_unittest.cc
index 4d56866f08dbb6e5317a94cfd263b0f5d9039d77..6d00fa59d3b0bd026d52e8c8c84053003d5849d5 100644
--- a/media/filters/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/filters/ffmpeg_video_decode_engine_unittest.cc
@@ -39,6 +39,10 @@ class FFmpegVideoDecodeEngineTest : public testing::Test {
     test_engine_->SetCodecContextForTest(&codec_context_);
   }
 
+  ~FFmpegVideoDecodeEngineTest() {
+    MockFFmpeg::set(NULL);
+  }
+
   scoped_ptr<FFmpegVideoDecodeEngine> test_engine_;
 
   StrictMock<MockFFmpeg> mock_ffmpeg_;