Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/video_capture_device.h

Index: media/video/capture/video_capture_device.h
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
index 91d0bf46c1aaaa55729a6d870629a20502fe717a..27001443a6bfd6700998a1e6c0b95beef2e9416f 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -17,6 +17,7 @@
 
 #include "base/time.h"
 #include "media/base/media_export.h"
+#include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
@@ -33,32 +34,6 @@ class MEDIA_EXPORT VideoCaptureDevice {
   };
   typedef std::list<Name> Names;
 
-  // Color formats from camera.
-  enum Format {
-    kColorUnknown,  // Color format not set.
-    kI420,
-    kYUY2,
-    kUYVY,
-    kRGB24,
-    kARGB,
-    kMJPEG,  // Currently only supported on Windows.
-    kNV21,
-    kYV12,
-  };
-
-  // Describes the format a camera capture video in.
-  struct Capability {
-    Capability()
-        : width(0),
-          height(0),
-          frame_rate(0),
-          color(kColorUnknown) {}
-    int width;
-    int height;
-    int frame_rate;
-    Format color;
-  };
-
   class EventHandler {
    public:
     // Captured a new video frame.
@@ -70,7 +45,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
     virtual void OnError() = 0;
     // Called when VideoCaptureDevice::Allocate has been called
     // to inform of the resulting frame size and color format.
-    virtual void OnFrameInfo(const Capability& info) = 0;
+    virtual void OnFrameInfo(const VideoCaptureCapability& info) = 0;
 
    protected:
     virtual ~EventHandler() {}