Revert 236927 "Reorganize media::VideoCapture* types"

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

Index: trunk/src/media/video/capture/win/video_capture_device_mf_win.h
===================================================================
--- trunk/src/media/video/capture/win/video_capture_device_mf_win.h	(revision 236934)
+++ trunk/src/media/video/capture/win/video_capture_device_mf_win.h	(working copy)
@@ -38,9 +38,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;
 
   // Returns true iff the current platform supports the Media Foundation API
@@ -71,7 +71,7 @@
   base::Lock lock_;  // Used to guard the below variables.
   scoped_ptr<VideoCaptureDevice::Client> client_;
   base::win::ScopedComPtr<IMFSourceReader> reader_;
-  VideoCaptureFormat capture_format_;
+  VideoCaptureCapability current_setting_;
   bool capture_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceMFWin);