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

content/browser/media/capture/web_contents_video_capture_device_unittest.cc

Index: content/browser/media/capture/web_contents_video_capture_device_unittest.cc
diff --git a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
index 10d8c064b033b8ff3c13b22e3a1e7acd863500fa..8b24ed798021ee8e4b6da1059bf0f2d09cd4477e 100644
--- a/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/media/capture/web_contents_video_capture_device_unittest.cc
@@ -336,14 +336,12 @@ class StubClient : public media::VideoCaptureDevice::Client {
   }
 
   scoped_refptr<media::VideoCaptureDevice::Client::Buffer> ReserveOutputBuffer(
-      media::VideoFrame::Format format,
+      media::VideoPixelFormat format,
       const gfx::Size& dimensions) override {
-    CHECK_EQ(format, media::VideoFrame::I420);
-    const size_t frame_bytes =
-        media::VideoFrame::AllocationSize(media::VideoFrame::I420, dimensions);
+    CHECK_EQ(format, media::PIXEL_FORMAT_I420);
     int buffer_id_to_drop = VideoCaptureBufferPool::kInvalidId;  // Ignored.
-    int buffer_id =
-        buffer_pool_->ReserveForProducer(frame_bytes, &buffer_id_to_drop);
+    int buffer_id = buffer_pool_->ReserveForProducer(format, dimensions,
+                                                     &buffer_id_to_drop);
     if (buffer_id == VideoCaptureBufferPool::kInvalidId)
       return NULL;
     void* data;