Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/mac/video_capture_device_qtkit_mac.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h"
 
 #import <QTKit/QTKit.h>
 
 #include "base/logging.h"
 #include "media/video/capture/mac/video_capture_device_mac.h"
 #include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
 
 @implementation VideoCaptureDeviceQTKit
 
 #pragma mark Class methods
 
 + (NSArray *)deviceNames {
   return [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo];
 }
 
 #pragma mark Public methods
@@ skipping 130 matching lines @@
   }
 
   // Lock the frame and calculate frame size.
   const int kLockFlags = 0;
   if (CVPixelBufferLockBaseAddress(videoFrame, kLockFlags)
       == kCVReturnSuccess) {
     void *baseAddress = CVPixelBufferGetBaseAddress(videoFrame);
     size_t bytesPerRow = CVPixelBufferGetBytesPerRow(videoFrame);
     int frameHeight = CVPixelBufferGetHeight(videoFrame);
     int frameSize = bytesPerRow * frameHeight;
-    media::VideoCaptureDevice::Capability captureCapability;
+    media::VideoCaptureCapability captureCapability;
     captureCapability.width = frameWidth_;
     captureCapability.height = frameHeight_;
     captureCapability.frame_rate = frameRate_;
-    captureCapability.color = media::VideoCaptureDevice::kARGB;
+    captureCapability.color = media::VideoCaptureCapability::kARGB;
+    captureCapability.expected_capture_delay = 0;
+    captureCapability.interlaced = false;
 
     // Deliver the captured video frame.
     frameReceiver_->ReceiveFrame(static_cast<UInt8*>(baseAddress), frameSize,
                                  captureCapability);
 
     CVPixelBufferUnlockBaseAddress(videoFrame, kLockFlags);
   }
 }
 
 @end