Remove media::VideoFrame from media::VideoCaptureDevice::Client interface

content/browser/renderer_host/media/desktop_capture_device_unittest.cc

Index: content/browser/renderer_host/media/desktop_capture_device_unittest.cc
diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
index d307a6012ca97b12bb01cf93cb6c40d817a4918a..a3926e94b261dca3921dc3d5d93675f4d02ea7f5 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
@@ -40,8 +40,9 @@ const int kFrameRate = 30;
 
 class MockDeviceClient : public media::VideoCaptureDevice::Client {
  public:
-  MOCK_METHOD1(ReserveOutputBuffer,
-               scoped_refptr<media::VideoFrame>(const gfx::Size& size));
+  MOCK_METHOD2(ReserveOutputBuffer,
+               scoped_refptr<Buffer>(media::VideoFrame::Format format,
+                                     const gfx::Size& dimensions));
   MOCK_METHOD0(OnError, void());
   MOCK_METHOD7(OnIncomingCapturedFrame,
                void(const uint8* data,
@@ -51,10 +52,12 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
                     bool flip_vert,
                     bool flip_horiz,
                     const media::VideoCaptureCapability& frame_info));
-  MOCK_METHOD3(OnIncomingCapturedVideoFrame,
-      void(const scoped_refptr<media::VideoFrame>& frame,
-           base::Time timestamp,
-           int frame_rate));
+  MOCK_METHOD5(OnIncomingCapturedBuffer,
+               void(const scoped_refptr<Buffer>& buffer,
+                    media::VideoFrame::Format format,
+                    const gfx::Size& dimensions,
+                    base::Time timestamp,
+                    int frame_rate));
 };
 
 // TODO(sergeyu): Move this to a separate file where it can be reused.
@@ -209,9 +212,9 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
   scoped_ptr<MockDeviceClient> client(new MockDeviceClient());
   EXPECT_CALL(*client, OnError()).Times(0);
   EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _, _, _))
-      .WillRepeatedly(DoAll(
-           SaveArg<6>(&caps),
-           InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
+      .WillRepeatedly(
+           DoAll(SaveArg<6>(&caps),
+                 InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
 
   media::VideoCaptureCapability capture_format(
       kTestFrameWidth2,