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..a01fbab932daef40db78b96433e7e2c3529a5f93 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -65,8 +65,8 @@ namespace {
 class MockClient : public VideoCaptureDevice::Client {
  public:
   MOCK_METHOD2(ReserveOutputBuffer,
-               scoped_refptr<Buffer>(VideoFrame::Format format,
-                                     const gfx::Size& dimensions));
+               scoped_refptr<Buffer>(media::VideoPixelFormat format,
+                 const gfx::Size& dimensions));
   MOCK_METHOD9(OnIncomingCapturedYuvData,
                void (const uint8* y_data,
                      const uint8* u_data,