| Index: media/video/mock_objects.h
 | 
| diff --git a/media/video/mock_objects.h b/media/video/mock_objects.h
 | 
| index 24cd4d3b3805d3d95f14056ac5fd2a2c4764f82e..c0f3dd928596172f34200764c1943c81669a01a9 100644
 | 
| --- a/media/video/mock_objects.h
 | 
| +++ b/media/video/mock_objects.h
 | 
| @@ -41,7 +41,7 @@ class MockVideoDecodeContext : public VideoDecodeContext {
 | 
|        std::vector<scoped_refptr<VideoFrame> >* frames,
 | 
|        Task* task));
 | 
|    MOCK_METHOD0(ReleaseAllVideoFrames, void());
 | 
| -  MOCK_METHOD3(UploadToVideoFrame,  void(
 | 
| +  MOCK_METHOD3(ConvertToVideoFrame,  void(
 | 
|        void* buffer, scoped_refptr<VideoFrame> frame, Task* task));
 | 
|    MOCK_METHOD1(Destroy, void(Task* task));
 | 
|  
 | 
| 
 |