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

content/browser/renderer_host/media/desktop_capture_device_unittest.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/media/desktop_capture_device.h"
 
 #include "base/basictypes.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
@@ skipping 22 matching lines @@
 
 const int kTestFrameWidth1 = 100;
 const int kTestFrameHeight1 = 100;
 const int kTestFrameWidth2 = 200;
 const int kTestFrameHeight2 = 150;
 
 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,
                     int length,
                     base::Time timestamp,
                     int rotation,
                     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.
 class FakeScreenCapturer : public webrtc::ScreenCapturer {
  public:
   FakeScreenCapturer()
       : callback_(NULL),
         frame_index_(0) {
   }
   virtual ~FakeScreenCapturer() {}
@@ skipping 134 matching lines @@
   DesktopCaptureDevice capture_device(
       worker_pool_->GetSequencedTaskRunner(worker_pool_->GetSequenceToken()),
       scoped_ptr<webrtc::DesktopCapturer>(mock_capturer));
 
   media::VideoCaptureCapability caps;
   base::WaitableEvent done_event(false, false);
 
   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,
       kTestFrameHeight2,
       kFrameRate,
       media::PIXEL_FORMAT_I420,
       media::VariableResolutionVideoCaptureDevice);
 
   capture_device.AllocateAndStart(
       capture_format, client.PassAs<media::VideoCaptureDevice::Client>());
 
   // Capture at least three frames, to ensure that the source frame size has
   // changed at least twice while capturing.
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
   done_event.Reset();
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
   done_event.Reset();
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
 
   capture_device.StopAndDeAllocate();
 
   EXPECT_EQ(kTestFrameWidth1, caps.width);
   EXPECT_EQ(kTestFrameHeight1, caps.height);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
   EXPECT_EQ(media::PIXEL_FORMAT_ARGB, caps.color);
   worker_pool_->FlushForTesting();
 }
 
 }  // namespace content