Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/video_capture_controller_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 VideoCaptureController.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 101 matching lines @@
   MOCK_METHOD1(StopCapture, void(const media::VideoCaptureSessionId&));
 
   void Start(const media::VideoCaptureParams& capture_params,
              media::VideoCaptureDevice::EventHandler* vc_receiver) OVERRIDE {
     StartCapture(capture_params.width, capture_params.height, vc_receiver);
     // TODO(mcasas): Add testing for variable resolution video capture devices,
     // supported by FakeVideoCaptureDevice. See crbug.com/261410, second part.
     media::VideoCaptureCapability capture_format(
         capture_params.width,
         capture_params.height,
-        capture_params.frame_per_second,
-        media::VideoCaptureCapability::kI420,
+        capture_params.frame_rate,
+        media::PIXEL_FORMAT_I420,
         0,
         false,
         media::ConstantResolutionVideoCaptureDevice);
     video_capture_device_->Allocate(capture_format, vc_receiver);
     video_capture_device_->Start();
   }
 
   void Stop(const media::VideoCaptureSessionId& capture_session_id,
             base::Closure stopped_cb) OVERRIDE {
     StopCapture(capture_session_id);
@@ skipping 43 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureControllerTest);
 };
 
 // Try to start and stop capture.
 TEST_F(VideoCaptureControllerTest, StartAndStop) {
   media::VideoCaptureParams capture_params;
   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(),
               StartCapture(capture_params.width,
                            capture_params.height,
                            controller_.get())).Times(1);
   EXPECT_CALL(*controller_handler_,
               DoFrameInfo(controller_handler_->controller_id_))
       .Times(AtLeast(1));
   EXPECT_CALL(*controller_handler_,
@@ skipping 14 matching lines @@
                             capture_params);
   message_loop_->Run();
 }
 
 // Try to stop session before stopping capture.
 TEST_F(VideoCaptureControllerTest, StopSession) {
   media::VideoCaptureParams capture_params;
   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(),
               StartCapture(capture_params.width,
                            capture_params.height,
                            controller_.get())).Times(1);
   EXPECT_CALL(*controller_handler_,
               DoFrameInfo(controller_handler_->controller_id_))
       .Times(AtLeast(1));
   EXPECT_CALL(*controller_handler_,
@@ skipping 23 matching lines @@
   message_loop_->PostDelayedTask(FROM_HERE,
       base::MessageLoop::QuitClosure(), base::TimeDelta::FromSeconds(1));
   message_loop_->Run();
 
   EXPECT_CALL(*vcm_.get(), StopCapture(vcm_->video_session_id_)).Times(1);
   controller_->StopCapture(controller_handler_->controller_id_,
                            controller_handler_.get());
 }
 
 }  // namespace content