Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/mac/video_capture_device_mac.h

Index: trunk/src/media/video/capture/mac/video_capture_device_mac.h
===================================================================
--- trunk/src/media/video/capture/mac/video_capture_device_mac.h	(revision 236934)
+++ trunk/src/media/video/capture/mac/video_capture_device_mac.h	(working copy)
@@ -30,9 +30,9 @@
   virtual ~VideoCaptureDeviceMac();
 
   // VideoCaptureDevice implementation.
-  virtual void AllocateAndStart(const VideoCaptureParams& params,
-                                scoped_ptr<VideoCaptureDevice::Client> client)
-      OVERRIDE;
+  virtual void AllocateAndStart(
+      const VideoCaptureCapability& capture_format,
+      scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE;
   virtual void StopAndDeAllocate() OVERRIDE;
 
   bool Init();
@@ -40,7 +40,7 @@
   // Called to deliver captured video frames.
   void ReceiveFrame(const uint8* video_frame,
                     int video_frame_length,
-                    const VideoCaptureFormat& frame_format,
+                    const VideoCaptureCapability& frame_info,
                     int aspect_numerator,
                     int aspect_denominator);
 
@@ -61,7 +61,7 @@
   Name device_name_;
   scoped_ptr<VideoCaptureDevice::Client> client_;
 
-  VideoCaptureFormat capture_format_;
+  VideoCaptureCapability current_settings_;
   bool sent_frame_info_;
   bool tried_to_square_pixels_;