Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/win/video_capture_device_win.h

Index: trunk/src/media/video/capture/win/video_capture_device_win.h
===================================================================
--- trunk/src/media/video/capture/win/video_capture_device_win.h	(revision 236934)
+++ trunk/src/media/video/capture/win/video_capture_device_win.h	(working copy)
@@ -40,9 +40,9 @@
   bool Init();
 
   // 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;
 
   static void GetDeviceNames(Names* device_names);
@@ -79,7 +79,7 @@
 
   // Map of all capabilities this device support.
   CapabilityList capabilities_;
-  VideoCaptureFormat capture_format_;
+  VideoCaptureCapability current_setting_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
 };