VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers

media/video/capture/video_capture_device_unittest.cc

Index: media/video/capture/video_capture_device_unittest.cc
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
index 061e6f0134f8e8ca5b6c38f7034b0348cc816186..ce596587b6bea44af4a8565817d43a8d235f54d5 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -64,9 +64,8 @@ namespace {
 
 class MockClient : public VideoCaptureDevice::Client {
  public:
-  MOCK_METHOD2(ReserveOutputBuffer,
-               scoped_refptr<Buffer>(VideoFrame::Format format,
-                                     const gfx::Size& dimensions));
+  MOCK_METHOD1(ReserveOutputBuffer,
+               scoped_refptr<Buffer>(const VideoCaptureFormat& format));
   MOCK_METHOD9(OnIncomingCapturedYuvData,
                void (const uint8* y_data,
                      const uint8* u_data,
@@ -139,7 +138,7 @@ class VideoCaptureDeviceTest : public testing::Test {
 #endif
     EXPECT_CALL(*client_, OnIncomingCapturedYuvData(_,_,_,_,_,_,_,_,_))
                .Times(0);
-    EXPECT_CALL(*client_, ReserveOutputBuffer(_,_)).Times(0);
+    EXPECT_CALL(*client_, ReserveOutputBuffer(_)).Times(0);
     EXPECT_CALL(*client_, OnIncomingCapturedVideoFrame(_,_,_)).Times(0);
   }