Consolidate duplicated frame / capability structures in video_capture_types.h

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 dd431a8b54e5ff3032a2232705f0651c0846659e..6e685c381fd83527bb3c5dbe935191d3a61dac2c 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.cc
@@ -50,22 +50,22 @@ static const char kUsbSuffixStart[] = " (";
 static const size_t kUsbModelSize = 9;
 static const char kUsbSuffixEnd[] = ")";
 
-static VideoCaptureCapability::Format V4l2ColorToVideoCaptureColorFormat(
+static VideoPixelFormat V4l2ColorToVideoCaptureColorFormat(
     int32 v4l2_fourcc) {
-  VideoCaptureCapability::Format result = VideoCaptureCapability::kColorUnknown;
+  VideoPixelFormat result = PIXEL_FORMAT_UNKNOWN;
   switch (v4l2_fourcc) {
     case V4L2_PIX_FMT_YUV420:
-      result = VideoCaptureCapability::kI420;
+      result = PIXEL_FORMAT_I420;
       break;
     case V4L2_PIX_FMT_YUYV:
-      result = VideoCaptureCapability::kYUY2;
+      result = PIXEL_FORMAT_YUY2;
       break;
     case V4L2_PIX_FMT_MJPEG:
     case V4L2_PIX_FMT_JPEG:
-      result = VideoCaptureCapability::kMJPEG;
+      result = PIXEL_FORMAT_MJPEG;
       break;
   }
-  DCHECK_NE(result, VideoCaptureCapability::kColorUnknown);
+  DCHECK_NE(result, PIXEL_FORMAT_UNKNOWN);
   return result;
 }