Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/linux/video_capture_device_linux.cc

Index: media/video/capture/linux/video_capture_device_linux.cc
diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc
index 7b99c204cb17d7e39bfee777f058e2d6c56139f4..487e77b43eff188f4d7d4eef85a0b280349348cd 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.cc
@@ -50,18 +50,18 @@ static const int32 kV4l2Fmts[] = {
   V4L2_PIX_FMT_YUYV
 };
 
-static VideoCaptureDevice::Format V4l2ColorToVideoCaptureColorFormat(
+static media::VideoFrame::Format V4l2ColorToVideoCaptureColorFormat(
     int32 v4l2_fourcc) {
-  VideoCaptureDevice::Format result = VideoCaptureDevice::kColorUnknown;
+  media::VideoFrame::Format result = media::VideoFrame::kColorUnknown;
   switch (v4l2_fourcc) {
     case V4L2_PIX_FMT_YUV420:
-      result = VideoCaptureDevice::kI420;
+      result = media::VideoFrame::kI420;
       break;
     case V4L2_PIX_FMT_YUYV:
-      result = VideoCaptureDevice::kYUY2;
+      result = media::VideoFrame::kYUY2;
       break;
   }
-  DCHECK_NE(result, VideoCaptureDevice::kColorUnknown);
+  DCHECK_NE(result, media::VideoFrame::kColorUnknown);
   return result;
 }
 
@@ -248,12 +248,14 @@ void VideoCaptureDeviceLinux::OnAllocate(int width,
   }
 
   // Store our current width and height.
-  Capability current_settings;
+  media::VideoCaptureCapability current_settings;
   current_settings.color = V4l2ColorToVideoCaptureColorFormat(
       video_fmt.fmt.pix.pixelformat);
   current_settings.width  = video_fmt.fmt.pix.width;
   current_settings.height = video_fmt.fmt.pix.height;
   current_settings.frame_rate = frame_rate;
+  current_settings.expected_capture_delay = 0;  // Ignored.
+  current_settings.interlaced = false;  // Ignored.
 
   state_ = kAllocated;
   // Report the resulting frame size to the observer.