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_METHOD0(DoReserveOutputBuffer, void());
   MOCK_METHOD0(OnError, void());
   MOCK_METHOD1(OnFrameInfo, void(const media::VideoCaptureCapability& info));
   MOCK_METHOD1(OnFrameInfoChanged,
       void(const media::VideoCaptureCapability& info));
   MOCK_METHOD6(OnIncomingCapturedFrame, void(const uint8* data,
                                              int length,
                                              base::Time timestamp,
                                              int rotation,
                                              bool flip_vert,
                                              bool flip_horiz));
-  MOCK_METHOD2(OnIncomingCapturedVideoFrame,
-      void(const scoped_refptr<media::VideoFrame>& frame,
-           base::Time timestamp));
+  MOCK_METHOD0(DoOnIncomingCapturedBuffer, void());
+
+  virtual scoped_ptr<media::VideoCaptureDevice::Client::Buffer>
+  ReserveOutputBuffer(media::VideoFrame::Format format,
+                      const gfx::Size& dimensions) OVERRIDE {
+    DoReserveOutputBuffer();
+    return scoped_ptr<media::VideoCaptureDevice::Client::Buffer>();
+  }
+
+  virtual void OnIncomingCapturedBuffer(scoped_ptr<Buffer> buffer,
+                                        media::VideoFrame::Format format,
+                                        const gfx::Size& dimensions,
+                                        base::Time timestamp) {
+    DoOnIncomingCapturedBuffer();
+  }
 };
 
 // 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 181 matching lines @@
   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