Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat.

content/browser/media/capture/web_contents_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 "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 331 matching lines @@
                      size_t y_stride,
                      size_t u_stride,
                      size_t v_stride,
                      const media::VideoCaptureFormat& frame_format,
                      int clockwise_rotation,
                      const base::TimeTicks& timestamp));
 
   MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
 
   scoped_ptr<media::VideoCaptureDevice::Client::Buffer> ReserveOutputBuffer(
+      const gfx::Size& dimensions,
       media::VideoPixelFormat format,
-      const gfx::Size& dimensions) override {
+      media::VideoPixelStorage storage) override {
     CHECK_EQ(format, media::PIXEL_FORMAT_I420);
     int buffer_id_to_drop = VideoCaptureBufferPool::kInvalidId;  // Ignored.
-    int buffer_id = buffer_pool_->ReserveForProducer(format, dimensions,
-                                                     &buffer_id_to_drop);
+    const int buffer_id = buffer_pool_->ReserveForProducer(
+        format, storage, dimensions, &buffer_id_to_drop);
     if (buffer_id == VideoCaptureBufferPool::kInvalidId)
       return NULL;
 
     return scoped_ptr<media::VideoCaptureDevice::Client::Buffer>(
         new AutoReleaseBuffer(
             buffer_pool_, buffer_pool_->GetBufferHandle(buffer_id), buffer_id));
   }
   // Trampoline method to workaround GMOCK problems with scoped_ptr<>.
   void OnIncomingCapturedBuffer(scoped_ptr<Buffer> buffer,
                                 const media::VideoCaptureFormat& frame_format,
@@ skipping 697 matching lines @@
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColorAndFrameSize(
       SK_ColorBLACK, gfx::Size(kTestWidth,
                                kTestWidth * arbitrary_source_size.height() /
                                    arbitrary_source_size.width())));
 
   device()->StopAndDeAllocate();
 }
 
 }  // namespace
 }  // namespace content