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

content/browser/media/capture/desktop_capture_device_aura_unittest.cc

Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc
diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
index 88c75a603cc91f2dff995299d159155fc21591fc..2ec6d4aa57f3f2ec1bec49095a772e3efc942844 100644
--- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
@@ -57,8 +57,14 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
   MOCK_METHOD1(OnError, void(const std::string& reason));
 
   // Trampoline methods to workaround GMOCK problems with scoped_ptr<>.
-  scoped_ptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format,
-                                         const gfx::Size& dimensions) override {
+  scoped_ptr<Buffer> ReserveOutputBuffer(
+      const gfx::Size& dimensions,
+      media::VideoPixelFormat format,
+      media::VideoPixelStorage storage) override {
+    EXPECT_TRUE((format == media::PIXEL_FORMAT_I420 &&
+                 storage == media::PIXEL_STORAGE_CPU) ||
+                (format == media::PIXEL_FORMAT_ARGB &&
+                 storage == media::PIXEL_STORAGE_TEXTURE));
     DoReserveOutputBuffer();
     return scoped_ptr<Buffer>();
   }