Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/desktop_capture_device_unittest.cc

Index: content/browser/renderer_host/media/desktop_capture_device_unittest.cc
diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
index cf050f5a210a0928a90c44b94c8032c4f3b359c8..023c71cd893bda2c36d7720b5ed2c8076b137565 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
@@ -132,7 +132,7 @@ TEST_F(DesktopCaptureDeviceTest, MAYBE_Capture) {
           InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
 
   media::VideoCaptureCapability capture_format(
-      640, 480, kFrameRate, media::VideoCaptureCapability::kI420, 0, false,
+      640, 480, kFrameRate, media::kI420, 0, false,
       media::ConstantResolutionVideoCaptureDevice);
   capture_device.Allocate(capture_format, &frame_observer);
   capture_device.Start();
@@ -143,7 +143,7 @@ TEST_F(DesktopCaptureDeviceTest, MAYBE_Capture) {
   EXPECT_GT(caps.width, 0);
   EXPECT_GT(caps.height, 0);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
-  EXPECT_EQ(media::VideoCaptureCapability::kARGB, caps.color);
+  EXPECT_EQ(media::kARGB, caps.color);
   EXPECT_FALSE(caps.interlaced);
 
   EXPECT_EQ(caps.width * caps.height * 4, frame_size);
@@ -179,7 +179,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {
       kTestFrameWidth1,
       kTestFrameHeight1,
       kFrameRate,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
@@ -199,7 +199,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {
   EXPECT_EQ(kTestFrameWidth1, caps.width);
   EXPECT_EQ(kTestFrameHeight1, caps.height);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
-  EXPECT_EQ(media::VideoCaptureCapability::kARGB, caps.color);
+  EXPECT_EQ(media::kARGB, caps.color);
   EXPECT_FALSE(caps.interlaced);
 
   EXPECT_EQ(caps.width * caps.height * 4, frame_size);
@@ -242,7 +242,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
       kTestFrameWidth2,
       kTestFrameHeight2,
       kFrameRate,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::VariableResolutionVideoCaptureDevice);
@@ -264,7 +264,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
   EXPECT_EQ(kTestFrameWidth1, caps.width);
   EXPECT_EQ(kTestFrameHeight1, caps.height);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
-  EXPECT_EQ(media::VideoCaptureCapability::kARGB, caps.color);
+  EXPECT_EQ(media::kARGB, caps.color);
   EXPECT_FALSE(caps.interlaced);
 }