Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/mac/video_capture_device_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.
 
 #include "media/video/capture/mac/video_capture_device_mac.h"
 
 #import <QTKit/QTKit.h>
 
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 52 matching lines @@
     return;
   }
   if (![capture_device_ setCaptureHeight:height
                                    width:width
                                frameRate:frame_rate]) {
     SetErrorState("Could not configure capture device.");
     return;
   }
 
   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);
 }
 
 void VideoCaptureDeviceMac::Start() {
   DCHECK_EQ(state_, kAllocated);
   if (![capture_device_ startCapture]) {
     SetErrorState("Could not start capture device.");
     return;
   }
@@ skipping 35 matching lines @@
       if (!capture_device_) {
         return false;
       }
       state_ = kIdle;
       return true;
     }
   }
   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());
 }
 
 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
   DLOG(ERROR) << reason;
   state_ = kError;
   observer_->OnError();
 }
 
 } // namespace media