Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/mac/video_capture_device_mac.mm

Index: media/video/capture/mac/video_capture_device_mac.mm
diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm
index b15a810705c6204f8ba5d89d06ed8f9ce8f64bb5..8b8032229247e5060378721c05284f8e75bcaea9 100644
--- a/media/video/capture/mac/video_capture_device_mac.mm
+++ b/media/video/capture/mac/video_capture_device_mac.mm
@@ -70,11 +70,13 @@ void VideoCaptureDeviceMac::Allocate(int width, int height, int frame_rate,
   }
 
   state_ = kAllocated;
-  Capability current_settings;
-  current_settings.color = kARGB;
+  VideoCaptureCapability current_settings;
+  current_settings.color = VideoCaptureCapability::kARGB;
   current_settings.width = width;
   current_settings.height = height;
   current_settings.frame_rate = frame_rate;
+  current_settings.expected_capture_delay = 0;
+  current_settings.interlaced = false;
 
   observer_->OnFrameInfo(current_settings);
 }
@@ -130,9 +132,10 @@ bool VideoCaptureDeviceMac::Init() {
   return false;
 }
 
-void VideoCaptureDeviceMac::ReceiveFrame(const uint8* video_frame,
-                                         int video_frame_length,
-                                         const Capability& frame_info) {
+void VideoCaptureDeviceMac::ReceiveFrame(
+    const uint8* video_frame,
+    int video_frame_length,
+    const VideoCaptureCapability& frame_info) {
   observer_->OnIncomingCapturedFrame(video_frame, video_frame_length,
                                      base::Time::Now());
 }