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

media/base/mock_ffmpeg.h

 // Copyright (c) 2010 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_BASE_MOCK_FFMPEG_H_
 #define MEDIA_BASE_MOCK_FFMPEG_H_
 
 // TODO(scherkus): See if we can remove ffmpeg_common from this file.
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 
 class MockFFmpeg {
  public:
   MockFFmpeg();
   virtual ~MockFFmpeg();
 
   // TODO(ajwong): Organize this class, and make sure that all mock entrypoints
   // are still used.
   MOCK_METHOD0(AVCodecInit, void());
   MOCK_METHOD1(AVRegisterProtocol, int(URLProtocol* protocol));
   MOCK_METHOD0(AVRegisterAll, void());
+  MOCK_METHOD1(AVRegisterLockManager, int(int (*cb)(void**, enum AVLockOp)));
 
   MOCK_METHOD1(AVCodecFindDecoder, AVCodec*(enum CodecID id));
   MOCK_METHOD2(AVCodecOpen, int(AVCodecContext* avctx, AVCodec* codec));
   MOCK_METHOD1(AVCodecClose, int(AVCodecContext* avctx));
   MOCK_METHOD2(AVCodecThreadInit, int(AVCodecContext* avctx, int threads));
   MOCK_METHOD1(AVCodecFlushBuffers, void(AVCodecContext* avctx));
   MOCK_METHOD0(AVCodecAllocFrame, AVFrame*());
   MOCK_METHOD4(AVCodecDecodeVideo2,
                int(AVCodecContext* avctx, AVFrame* picture,
                    int* got_picture_ptr, AVPacket* avpkt));
@@ skipping 105 matching lines @@
     arg0->destruct(arg0);
   }
 
   // Decrement number of packets allocated.
   MockFFmpeg::get()->dec_outstanding_packets();
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FFMPEG_H_