Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/video_capture_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Unit test for VideoCaptureManager.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 95 matching lines @@
 
   // Wait to get device callback.
   message_loop_->RunUntilIdle();
 
   int video_session_id = vcm_->Open(devices.front());
 
   media::VideoCaptureParams capture_params;
   capture_params.session_id = video_session_id;
   capture_params.width = 320;
   capture_params.height = 240;
-  capture_params.frame_per_second = 30;
+  capture_params.frame_rate = 30;
   vcm_->Start(capture_params, frame_observer_.get());
 
   vcm_->Stop(video_session_id, base::Closure());
   vcm_->Close(video_session_id);
 
   // Wait to check callbacks before removing the listener.
   message_loop_->RunUntilIdle();
   vcm_->Unregister();
 }
 
@@ skipping 88 matching lines @@
 // Start a device using "magic" id, i.e. call Start without calling Open.
 TEST_F(VideoCaptureManagerTest, StartUsingId) {
   InSequence s;
   EXPECT_CALL(*listener_, Opened(MEDIA_DEVICE_VIDEO_CAPTURE, _)).Times(1);
   EXPECT_CALL(*listener_, Closed(MEDIA_DEVICE_VIDEO_CAPTURE, _)).Times(1);
 
   media::VideoCaptureParams capture_params;
   capture_params.session_id = VideoCaptureManager::kStartOpenSessionId;
   capture_params.width = 320;
   capture_params.height = 240;
-  capture_params.frame_per_second = 30;
+  capture_params.frame_rate = 30;
 
   // Start shall trigger the Open callback.
   vcm_->Start(capture_params, frame_observer_.get());
 
   // Stop shall trigger the Close callback
   vcm_->Stop(VideoCaptureManager::kStartOpenSessionId, base::Closure());
 
   // Wait to check callbacks before removing the listener.
   message_loop_->RunUntilIdle();
   vcm_->Unregister();
@@ skipping 13 matching lines @@
 
   // Wait to get device callback.
   message_loop_->RunUntilIdle();
 
   int video_session_id = vcm_->Open(devices.front());
 
   media::VideoCaptureParams capture_params;
   capture_params.session_id = video_session_id;
   capture_params.width = 320;
   capture_params.height = 240;
-  capture_params.frame_per_second = 30;
+  capture_params.frame_rate = 30;
   vcm_->Start(capture_params, frame_observer_.get());
 
   // Close will stop the running device, an assert will be triggered in
   // VideoCaptureManager destructor otherwise.
   vcm_->Close(video_session_id);
   vcm_->Stop(video_session_id, base::Closure());
 
   // Wait to check callbacks before removing the listener
   message_loop_->RunUntilIdle();
   vcm_->Unregister();
 }
 
 }  // namespace content