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

media/video/capture/video_capture_device_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 46 matching lines @@
 
 using ::testing::_;
 using ::testing::SaveArg;
 
 namespace media {
 
 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,
                      const uint8* v_data,
                      size_t y_stride,
                      size_t u_stride,
                      size_t v_stride,
                      const VideoCaptureFormat& frame_format,
                      int clockwise_rotation,
                      const base::TimeTicks& timestamp));
@@ skipping 52 matching lines @@
     device_enumeration_listener_ = new DeviceEnumerationListener();
   }
 
   void SetUp() override {
 #if defined(OS_ANDROID)
     VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(
         base::android::AttachCurrentThread());
 #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);
   }
 
   void ResetWithNewClient() {
     client_.reset(new MockClient(base::Bind(
         &VideoCaptureDeviceTest::OnFrameCaptured, base::Unretained(this))));
   }
 
   void OnFrameCaptured(const VideoCaptureFormat& format) {
     last_format_ = format;
@@ skipping 288 matching lines @@
   // Use PIXEL_FORMAT_MAX to iterate all device names for testing
   // GetDeviceSupportedFormats().
   scoped_ptr<VideoCaptureDevice::Name> name =
       GetFirstDeviceNameSupportingPixelFormat(PIXEL_FORMAT_MAX);
   // Verify no camera returned for PIXEL_FORMAT_MAX. Nothing else to test here
   // since we cannot forecast the hardware capabilities.
   ASSERT_FALSE(name);
 }
 
 };  // namespace media