Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc

Index: content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
index bc5645de92bd62b305b8b0894e955f8d11205128..8fbaca2c4505f42ae564554614ef4a21da99ace9 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
@@ -407,7 +407,7 @@ class StubConsumer : public media::VideoCaptureDevice::EventHandler {
     EXPECT_EQ(kTestWidth, info.width);
     EXPECT_EQ(kTestHeight, info.height);
     EXPECT_EQ(kTestFramesPerSecond, info.frame_rate);
-    EXPECT_EQ(media::VideoCaptureCapability::kI420, info.color);
+    EXPECT_EQ(media::PIXEL_FORMAT_I420, info.color);
   }
 
  private:
@@ -547,7 +547,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, InvalidInitialWebContentsError) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -564,7 +564,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, WebContentsDestroyed) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -593,7 +593,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest,
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -619,7 +619,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, StopWithRendererWorkToDo) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -649,7 +649,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, DeviceRestart) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -691,7 +691,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, GoesThroughAllTheMotions) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -747,7 +747,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, RejectsInvalidAllocateParams) {
       1280,
       720,
       -2,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -765,7 +765,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, BadFramesGoodFrames) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::PIXEL_FORMAT_I420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);