| Index: webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h | 
| diff --git a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h | 
| index 69a9375704bf44dfc6fd9fdb24c2f9a1c35b7d34..d727e896ad029850757ea39a735b0873b4826521 100644 | 
| --- a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h | 
| +++ b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h | 
| @@ -8,12 +8,13 @@ | 
| *  be found in the AUTHORS file in the root of the source tree. | 
| */ | 
|  | 
| -#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ | 
| -#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ | 
| - | 
| -#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; use video_coding/include") | 
| +#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ | 
| +#define WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ | 
|  | 
| +#pragma message("WARNING: video_coding/codecs/interface is DEPRECATED; " | 
| +    "use video_coding/include") | 
| #include <string> | 
| +#include <vector> | 
|  | 
| #include "testing/gmock/include/gmock/gmock.h" | 
| #include "webrtc/modules/video_coding/include/video_codec_interface.h" | 
| @@ -23,17 +24,19 @@ namespace webrtc { | 
|  | 
| class MockEncodedImageCallback : public EncodedImageCallback { | 
| public: | 
| -  MOCK_METHOD3(Encoded, int32_t(const EncodedImage& encodedImage, | 
| -                                const CodecSpecificInfo* codecSpecificInfo, | 
| -                                const RTPFragmentationHeader* fragmentation)); | 
| +  MOCK_METHOD3(Encoded, | 
| +               int32_t(const EncodedImage& encodedImage, | 
| +                       const CodecSpecificInfo* codecSpecificInfo, | 
| +                       const RTPFragmentationHeader* fragmentation)); | 
| }; | 
|  | 
| class MockVideoEncoder : public VideoEncoder { | 
| public: | 
| -  MOCK_CONST_METHOD2(Version, int32_t(int8_t *version, int32_t length)); | 
| -  MOCK_METHOD3(InitEncode, int32_t(const VideoCodec* codecSettings, | 
| -                                   int32_t numberOfCores, | 
| -                                   size_t maxPayloadSize)); | 
| +  MOCK_CONST_METHOD2(Version, int32_t(int8_t* version, int32_t length)); | 
| +  MOCK_METHOD3(InitEncode, | 
| +               int32_t(const VideoCodec* codecSettings, | 
| +                       int32_t numberOfCores, | 
| +                       size_t maxPayloadSize)); | 
| MOCK_METHOD3(Encode, | 
| int32_t(const VideoFrame& inputImage, | 
| const CodecSpecificInfo* codecSpecificInfo, | 
| @@ -49,24 +52,24 @@ class MockVideoEncoder : public VideoEncoder { | 
|  | 
| class MockDecodedImageCallback : public DecodedImageCallback { | 
| public: | 
| -  MOCK_METHOD1(Decoded, int32_t(VideoFrame& decodedImage)); | 
| -  MOCK_METHOD2(Decoded, int32_t(VideoFrame& decodedImage, | 
| -                                int64_t decode_time_ms)); | 
| +  MOCK_METHOD1(Decoded, int32_t(const VideoFrame& decodedImage)); | 
| +  MOCK_METHOD2(Decoded, | 
| +               int32_t(const VideoFrame& decodedImage, int64_t decode_time_ms)); | 
| MOCK_METHOD1(ReceivedDecodedReferenceFrame, | 
| int32_t(const uint64_t pictureId)); | 
| -  MOCK_METHOD1(ReceivedDecodedFrame, | 
| -               int32_t(const uint64_t pictureId)); | 
| +  MOCK_METHOD1(ReceivedDecodedFrame, int32_t(const uint64_t pictureId)); | 
| }; | 
|  | 
| class MockVideoDecoder : public VideoDecoder { | 
| public: | 
| -  MOCK_METHOD2(InitDecode, int32_t(const VideoCodec* codecSettings, | 
| -                                   int32_t numberOfCores)); | 
| -  MOCK_METHOD5(Decode, int32_t(const EncodedImage& inputImage, | 
| -                               bool missingFrames, | 
| -                               const RTPFragmentationHeader* fragmentation, | 
| -                               const CodecSpecificInfo* codecSpecificInfo, | 
| -                               int64_t renderTimeMs)); | 
| +  MOCK_METHOD2(InitDecode, | 
| +               int32_t(const VideoCodec* codecSettings, int32_t numberOfCores)); | 
| +  MOCK_METHOD5(Decode, | 
| +               int32_t(const EncodedImage& inputImage, | 
| +                       bool missingFrames, | 
| +                       const RTPFragmentationHeader* fragmentation, | 
| +                       const CodecSpecificInfo* codecSpecificInfo, | 
| +                       int64_t renderTimeMs)); | 
| MOCK_METHOD1(RegisterDecodeCompleteCallback, | 
| int32_t(DecodedImageCallback* callback)); | 
| MOCK_METHOD0(Release, int32_t()); | 
| @@ -76,4 +79,4 @@ class MockVideoDecoder : public VideoDecoder { | 
|  | 
| }  // namespace webrtc | 
|  | 
| -#endif  // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ | 
| +#endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_INTERFACE_MOCK_MOCK_VIDEO_CODEC_INTERFACE_H_ | 
|  |