Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Unified Diff: services/video_capture/fake_device_descriptor_unittest.cc

Issue 2386183002: Replace manual conversions with Mojo type mappings
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/video_capture/fake_device_descriptor_test.cc ('k') | services/video_capture/fake_device_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2f356328fbe3c0ae2a9e14a21b3a3c7a5b670414..166249ed297dbe70601d9964c8956bf755439879 100644
--- a/services/video_capture/fake_device_descriptor_unittest.cc
+++ b/services/video_capture/fake_device_descriptor_unittest.cc
@@ -27,7 +27,7 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {
Run(mojom::DeviceAccessResultCode::SUCCESS))
.Times(1);
factory_->CreateDeviceProxy(
- fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_1),
+ fake_device_descriptor_, mojo::GetProxy(&device_proxy_1),
base::Bind(&MockCreateDeviceProxyCallback::Run,
base::Unretained(&create_device_proxy_callback_1)));
device_proxy_1.set_connection_error_handler(
@@ -43,7 +43,7 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {
.Times(1)
.WillOnce(InvokeWithoutArgs([&wait_loop]() { wait_loop.Quit(); }));
factory_->CreateDeviceProxy(
- fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_2),
+ fake_device_descriptor_, mojo::GetProxy(&device_proxy_2),
base::Bind(&MockCreateDeviceProxyCallback::Run,
base::Unretained(&create_device_proxy_callback_2)));
device_proxy_2.set_connection_error_handler(
@@ -58,27 +58,26 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {
TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) {
mojom::VideoCaptureDeviceProxyPtr device_proxy_1;
factory_->CreateDeviceProxy(
- fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_1),
+ fake_device_descriptor_, mojo::GetProxy(&device_proxy_1),
base::Bind([](mojom::DeviceAccessResultCode result_code) {}));
base::RunLoop wait_loop;
mojom::VideoCaptureDeviceProxyPtr device_proxy_2;
factory_->CreateDeviceProxy(
- fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_2),
+ fake_device_descriptor_, mojo::GetProxy(&device_proxy_2),
base::Bind(
[](base::RunLoop* wait_loop,
mojom::DeviceAccessResultCode result_code) { wait_loop->Quit(); },
&wait_loop));
wait_loop.Run();
- auto arbitrary_requested_settings = mojom::VideoCaptureSettings::New();
- arbitrary_requested_settings->format = mojom::VideoCaptureFormat::New();
- arbitrary_requested_settings->format->frame_size.SetSize(640, 480);
- arbitrary_requested_settings->format->frame_rate = 15;
- arbitrary_requested_settings->resolution_change_policy =
- mojom::ResolutionChangePolicy::FIXED_RESOLUTION;
- arbitrary_requested_settings->power_line_frequency =
- mojom::PowerLineFrequency::DEFAULT;
+ media::VideoCaptureParams arbitrary_requested_settings;
+ arbitrary_requested_settings.requested_format.frame_size.SetSize(640, 480);
+ arbitrary_requested_settings.requested_format.frame_rate = 15;
+ arbitrary_requested_settings.resolution_change_policy =
+ media::RESOLUTION_POLICY_FIXED_RESOLUTION;
+ arbitrary_requested_settings.power_line_frequency =
+ media::PowerLineFrequency::FREQUENCY_DEFAULT;
base::RunLoop wait_loop_2;
mojom::VideoFrameReceiverPtr receiver_proxy;
« no previous file with comments | « services/video_capture/fake_device_descriptor_test.cc ('k') | services/video_capture/fake_device_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698