Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm

Index: trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm
===================================================================
--- trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm	(revision 236934)
+++ trunk/src/media/video/capture/mac/video_capture_device_qtkit_mac.mm	(working copy)
@@ -281,11 +281,12 @@
       addressToPass = adjustedAddress;
       frameSize = frameHeight * expectedBytesPerRow;
     }
+    media::VideoCaptureCapability captureCapability;
+    captureCapability.width = frameWidth;
+    captureCapability.height = frameHeight;
+    captureCapability.frame_rate = frameRate_;
+    captureCapability.color = media::PIXEL_FORMAT_UYVY;
 
-    media::VideoCaptureFormat captureFormat(gfx::Size(frameWidth, frameHeight),
-                                            frameRate_,
-                                            media::PIXEL_FORMAT_UYVY);
-
     // The aspect ratio dictionary is often missing, in which case we report
     // a pixel aspect ratio of 0:0.
     int aspectNumerator = 0, aspectDenominator = 0;
@@ -304,7 +305,7 @@
     }
 
     // Deliver the captured video frame.
-    frameReceiver_->ReceiveFrame(addressToPass, frameSize, captureFormat,
+    frameReceiver_->ReceiveFrame(addressToPass, frameSize, captureCapability,
         aspectNumerator, aspectDenominator);
 
     CVPixelBufferUnlockBaseAddress(videoFrame, kLockFlags);