Chromium Code Reviews| Index: services/video_capture/fake_device_descriptor_unittest.cc |
| diff --git a/services/video_capture/fake_device_descriptor_unittest.cc b/services/video_capture/fake_device_descriptor_unittest.cc |
| index c0764270b85bbaac80af5b03565c7cb939b01419..c20c020e8b08ceb477ff8b293dba025a95a077ac 100644 |
| --- a/services/video_capture/fake_device_descriptor_unittest.cc |
| +++ b/services/video_capture/fake_device_descriptor_unittest.cc |
| @@ -71,11 +71,11 @@ TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) { |
| &wait_loop)); |
| wait_loop.Run(); |
| - auto arbitrary_requested_format = mojom::VideoCaptureFormat::New(); |
| - arbitrary_requested_format->frame_size.SetSize(640, 480); |
| - arbitrary_requested_format->frame_rate = 15; |
| - arbitrary_requested_format->pixel_format = media::mojom::VideoFormat::I420; |
| - arbitrary_requested_format->pixel_storage = mojom::VideoPixelStorage::CPU; |
| + media::VideoCaptureFormat arbitrary_requested_format; |
|
chfremer
2016/10/03 16:26:59
We ended up doing duplicate work here.
I already
mcasas
2016/10/03 21:19:07
Ah! Apologies, my bad, I started working on migrat
|
| + arbitrary_requested_format.frame_size.SetSize(640, 480); |
| + arbitrary_requested_format.frame_rate = 15; |
| + arbitrary_requested_format.pixel_format = media::PIXEL_FORMAT_I420; |
| + arbitrary_requested_format.pixel_storage = media::PIXEL_STORAGE_CPU; |
| base::RunLoop wait_loop_2; |
| mojom::VideoCaptureDeviceClientPtr client_proxy; |
| @@ -84,7 +84,7 @@ TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) { |
| .WillRepeatedly( |
| InvokeWithoutArgs([&wait_loop_2]() { wait_loop_2.Quit(); })); |
| - device_proxy_2->Start(std::move(arbitrary_requested_format), |
| + device_proxy_2->Start(arbitrary_requested_format, |
|
chfremer
2016/10/03 16:26:59
One thing I have asked myself here is whether or n
mcasas
2016/10/03 21:19:07
That' a legit concern. I believe in Chromium we fo
|
| mojom::ResolutionChangePolicy::FIXED_RESOLUTION, |
| mojom::PowerLineFrequency::DEFAULT, |
| std::move(client_proxy)); |