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

media/base/mock_ffmpeg.cc

 // Copyright (c) 2009 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.
 
 #include "media/base/mock_ffmpeg.h"
 
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 using ::testing::_;
@@ skipping 22 matching lines @@
     EXPECT_CALL(*this, AVCodecInit())
         .Times(AtMost(1))
         .WillOnce(Return());
     EXPECT_CALL(*this, AVRegisterProtocol(_))
         .Times(AtMost(1))
         .WillOnce(DoAll(SaveArg<0>(&protocol_), Return(0)));
     EXPECT_CALL(*this, AVRegisterAll())
         .Times(AtMost(1))
         .WillOnce(Return());
   }
+  // av_lockmgr_register() is also called from ~FFmpegLock(), so we expect
+  // it to be called at the end.
+  EXPECT_CALL(*this, AVRegisterLockManager(_))
+    .Times(AtMost(2))
+    .WillRepeatedly(Return(0));
 }
 
 MockFFmpeg::~MockFFmpeg() {
   CHECK(!outstanding_packets_)
       << "MockFFmpeg destroyed with outstanding packets";
 }
 
 void MockFFmpeg::inc_outstanding_packets() {
   ++outstanding_packets_;
 }
@@ skipping 32 matching lines @@
 }
 
 int av_register_protocol(URLProtocol* protocol) {
   return media::MockFFmpeg::get()->AVRegisterProtocol(protocol);
 }
 
 void av_register_all() {
   media::MockFFmpeg::get()->AVRegisterAll();
 }
 
+int av_lockmgr_register(int (*cb)(void**, enum AVLockOp)) {
+  media::MockFFmpeg* mock = media::MockFFmpeg::get();
+  // Here |mock| may be NULL when this function is called from ~FFmpegGlue().
+  if (mock != NULL) {
+    return mock->AVRegisterLockManager(cb);
+  } else {
+    return 0;
+  }
+}
+
 AVCodec* avcodec_find_decoder(enum CodecID id) {
   return media::MockFFmpeg::get()->AVCodecFindDecoder(id);
 }
 
 int avcodec_open(AVCodecContext* avctx, AVCodec* codec) {
   return media::MockFFmpeg::get()->AVCodecOpen(avctx, codec);
 }
 
 int avcodec_close(AVCodecContext* avctx) {
   return media::MockFFmpeg::get()->AVCodecClose(avctx);
@@ skipping 100 matching lines @@
   media::MockFFmpeg::get()->AVLogSetLevel(level);
 }
 
 void av_destruct_packet(AVPacket *pkt) {
   media::MockFFmpeg::get()->AVDestructPacket(pkt);
 }
 
 }  // extern "C"
 
 }  // namespace media