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

content/browser/media/capture/desktop_capture_device_unittest.cc

Index: content/browser/media/capture/desktop_capture_device_unittest.cc
diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc
index 115a421bdf7a64b769d0e455f9c9be7a0ac3b68d..6a131014138dc7c8f6d3dcf52a0c6ae234b50524 100644
--- a/content/browser/media/capture/desktop_capture_device_unittest.cc
+++ b/content/browser/media/capture/desktop_capture_device_unittest.cc
@@ -78,12 +78,8 @@
   MOCK_METHOD1(OnError, void(const std::string& reason));
 
   // Trampoline methods to workaround GMOCK problems with scoped_ptr<>.
-  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);
+  scoped_ptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format,
+                                         const gfx::Size& dimensions) override {
     DoReserveOutputBuffer();
     return scoped_ptr<Buffer>();
   }