Chromium Code Reviews| Index: media/capture/video/fake_video_capture_device_unittest.cc |
| diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc |
| index 29cd449f9d3c8f638b2934dee8f5052c4a126582..67a1a8a153d72a4817afe95eca19b0188e891162 100644 |
| --- a/media/capture/video/fake_video_capture_device_unittest.cc |
| +++ b/media/capture/video/fake_video_capture_device_unittest.cc |
| @@ -286,9 +286,10 @@ TEST_P(FakeVideoCaptureDeviceTest, CaptureUsing) { |
| EnumerateDevices()); |
| ASSERT_FALSE(descriptors->empty()); |
| - auto device = FakeVideoCaptureDeviceMaker::MakeInstance( |
| - testing::get<0>(GetParam()), testing::get<1>(GetParam()), |
| - testing::get<2>(GetParam())); |
| + std::unique_ptr<VideoCaptureDevice> device = |
|
chfremer
2017/03/02 17:56:10
Thanks for these cleanups!
braveyao
2017/03/03 17:53:12
Acknowledged.
|
| + FakeVideoCaptureDeviceMaker::MakeInstance(testing::get<0>(GetParam()), |
| + testing::get<1>(GetParam()), |
| + testing::get<2>(GetParam())); |
| ASSERT_TRUE(device); |
| // First: Requested, Second: Expected |
| @@ -301,7 +302,7 @@ TEST_P(FakeVideoCaptureDeviceTest, CaptureUsing) { |
| gfx::Size(1920, 1080)); |
| for (const auto& resolution : resolutions_to_test) { |
| - auto client = CreateClient(); |
| + std::unique_ptr<MockClient> client = CreateClient(); |
| EXPECT_CALL(*client, OnError(_, _)).Times(0); |
| EXPECT_CALL(*client, OnStarted()); |
| @@ -391,10 +392,12 @@ TEST_F(FakeVideoCaptureDeviceTest, GetCameraCalibration) { |
| } |
| TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) { |
| - auto device = FakeVideoCaptureDeviceMaker::MakeInstance( |
| - FakeVideoCaptureDeviceMaker::PixelFormat::I420, |
| - FakeVideoCaptureDeviceMaker::DeliveryMode::USE_DEVICE_INTERNAL_BUFFERS, |
| - 30.0); |
| + std::unique_ptr<VideoCaptureDevice> device = |
| + FakeVideoCaptureDeviceMaker::MakeInstance( |
| + FakeVideoCaptureDeviceMaker::PixelFormat::I420, |
| + FakeVideoCaptureDeviceMaker::DeliveryMode:: |
| + USE_DEVICE_INTERNAL_BUFFERS, |
| + 30.0); |
| ASSERT_TRUE(device); |
| VideoCaptureParams capture_params; |
| @@ -415,7 +418,8 @@ TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) { |
| run_loop_.reset(new base::RunLoop()); |
| run_loop_->Run(); |
| - auto* capabilities = image_capture_client_->capabilities(); |
| + const mojom::PhotoCapabilities* capabilities = |
| + image_capture_client_->capabilities(); |
| ASSERT_TRUE(capabilities); |
| EXPECT_EQ(100, capabilities->iso->min); |
| EXPECT_EQ(100, capabilities->iso->max); |
| @@ -503,10 +507,12 @@ TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) { |
| } |
| TEST_F(FakeVideoCaptureDeviceTest, TakePhoto) { |
| - auto device = FakeVideoCaptureDeviceMaker::MakeInstance( |
| - FakeVideoCaptureDeviceMaker::PixelFormat::I420, |
| - FakeVideoCaptureDeviceMaker::DeliveryMode::USE_DEVICE_INTERNAL_BUFFERS, |
| - 30.0); |
| + std::unique_ptr<VideoCaptureDevice> device = |
| + FakeVideoCaptureDeviceMaker::MakeInstance( |
| + FakeVideoCaptureDeviceMaker::PixelFormat::I420, |
| + FakeVideoCaptureDeviceMaker::DeliveryMode:: |
| + USE_DEVICE_INTERNAL_BUFFERS, |
| + 30.0); |
| ASSERT_TRUE(device); |
| VideoCaptureParams capture_params; |
| @@ -568,7 +574,7 @@ TEST_P(FakeVideoCaptureDeviceFactoryTest, FrameRateAndDeviceCount) { |
| capture_params.requested_format.frame_rate = GetParam().expected_fps; |
| capture_params.requested_format.pixel_format = |
| GetParam().expected_pixel_formats[device_index]; |
| - auto client = CreateClient(); |
| + std::unique_ptr<MockClient> client = CreateClient(); |
| EXPECT_CALL(*client, OnStarted()); |
| device->AllocateAndStart(capture_params, std::move(client)); |
| WaitForCapturedFrame(); |