Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/video_capture_controller_unittest.cc

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index c4b716d2e333333b25ba2f535b6fe6fd3b839530..88244cbe89edea5fafb694cfe505cdd1c2e2fb97 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -119,8 +119,8 @@ class MockVideoCaptureManager : public VideoCaptureManager {
     media::VideoCaptureCapability capture_format(
         capture_params.width,
         capture_params.height,
-        capture_params.frame_per_second,
-        media::VideoCaptureCapability::kI420,
+        capture_params.frame_rate,
+        media::kI420,
         0,
         false,
         media::ConstantResolutionVideoCaptureDevice);
@@ -184,7 +184,7 @@ TEST_F(VideoCaptureControllerTest, StartAndStop) {
   capture_params.session_id = vcm_->video_session_id_;
   capture_params.width = 320;
   capture_params.height = 240;
-  capture_params.frame_per_second = 30;
+  capture_params.frame_rate = 30;
 
   InSequence s;
   EXPECT_CALL(*vcm_.get(),
@@ -219,7 +219,7 @@ TEST_F(VideoCaptureControllerTest, StopSession) {
   capture_params.session_id = vcm_->video_session_id_;
   capture_params.width = 320;
   capture_params.height = 240;
-  capture_params.frame_per_second = 30;
+  capture_params.frame_rate = 30;
 
   InSequence s;
   EXPECT_CALL(*vcm_.get(),