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 d88d553fa735daff741ebcbe48d90342b60a1af8..1e8aa1b9b4433eb4514e69c344961456180be33d 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
@@ -405,7 +405,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::kI420, info.color);
   }
 
  private:
@@ -545,7 +545,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, InvalidInitialWebContentsError) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -562,7 +562,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, WebContentsDestroyed) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -591,7 +591,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest,
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -617,7 +617,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, StopWithRendererWorkToDo) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -647,7 +647,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, DeviceRestart) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -689,7 +689,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, GoesThroughAllTheMotions) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -745,7 +745,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, RejectsInvalidAllocateParams) {
       1280,
       720,
       -2,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -763,7 +763,7 @@ TEST_F(WebContentsVideoCaptureDeviceTest, BadFramesGoodFrames) {
       kTestWidth,
       kTestHeight,
       kTestFramesPerSecond,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);