Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/video_capture_device.h

Index: trunk/src/media/video/capture/video_capture_device.h
===================================================================
--- trunk/src/media/video/capture/video_capture_device.h	(revision 236934)
+++ trunk/src/media/video/capture/video_capture_device.h	(working copy)
@@ -20,7 +20,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
-#include "media/base/video_frame.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace media {
@@ -173,7 +172,7 @@
         int rotation,  // Clockwise.
         bool flip_vert,
         bool flip_horiz,
-        const VideoCaptureFormat& frame_format) = 0;
+        const VideoCaptureCapability& frame_info) = 0;
 
     // Captured a new video frame, held in |buffer|.
     //
@@ -209,10 +208,12 @@
                                         VideoCaptureCapabilities* formats);
 
   // Prepare the camera for use. After this function has been called no other
-  // applications can use the camera. StopAndDeAllocate() must be called before
-  // the object is deleted.
-  virtual void AllocateAndStart(const VideoCaptureParams& params,
-                                scoped_ptr<Client> client) = 0;
+  // applications can use the camera. On completion Client::OnFrameInfo()
+  // is called informing of the resulting resolution and frame rate.
+  // StopAndDeAllocate() must be called before the object is deleted.
+  virtual void AllocateAndStart(
+      const VideoCaptureCapability& capture_format,
+      scoped_ptr<Client> client) = 0;
 
   // Deallocates the camera, possibly asynchronously.
   //