Index: services/video_capture/mock_device_test.cc |
diff --git a/services/video_capture/mock_device_test.cc b/services/video_capture/mock_device_test.cc |
index 889a280e1347af9dda1b7f41e4baf0105d5b8780..da18ddc732384c42d147cf09da8dbcdff32b845d 100644 |
--- a/services/video_capture/mock_device_test.cc |
+++ b/services/video_capture/mock_device_test.cc |
@@ -9,8 +9,7 @@ namespace video_capture { |
MockDeviceTest::MockDeviceTest() |
: shell::test::ServiceTest("exe:video_capture_unittests") {} |
-MockDeviceTest::~MockDeviceTest() = |
- default; |
+MockDeviceTest::~MockDeviceTest() = default; |
void MockDeviceTest::SetUp() { |
ServiceTest::SetUp(); |
@@ -20,26 +19,24 @@ void MockDeviceTest::SetUp() { |
// Set up a mock device and add it to the factory |
mock_device_ = base::MakeUnique<MockVideoCaptureDeviceImpl>( |
mojo::GetProxy(&mock_device_proxy_)); |
- auto mock_descriptor = mojom::VideoCaptureDeviceDescriptor::New(); |
- mock_descriptor->device_id = "MockDeviceId"; |
+ media::VideoCaptureDeviceDescriptor mock_descriptor; |
+ mock_descriptor.device_id = "MockDeviceId"; |
ASSERT_TRUE(service_->AddDeviceToMockFactory(std::move(mock_device_proxy_), |
- mock_descriptor->Clone())); |
+ mock_descriptor)); |
// Obtain the mock device from the factory |
factory_->CreateDeviceProxy( |
- mock_descriptor->Clone(), mojo::GetProxy(&device_proxy_), |
+ mock_descriptor, mojo::GetProxy(&device_proxy_), |
base::Bind([](mojom::DeviceAccessResultCode result_code) {})); |
// Start the mock device with arbitrary requested settings |
gfx::Size requested_size(800, 600); |
- requested_settings_ = mojom::VideoCaptureSettings::New(); |
- requested_settings_->format = mojom::VideoCaptureFormat::New(); |
- requested_settings_->format->frame_size = requested_size; |
- requested_settings_->format->frame_rate = 15; |
- requested_settings_->resolution_change_policy = |
- mojom::ResolutionChangePolicy::FIXED_RESOLUTION; |
- requested_settings_->power_line_frequency = |
- mojom::PowerLineFrequency::DEFAULT; |
+ requested_settings_.requested_format.frame_size = requested_size; |
+ requested_settings_.requested_format.frame_rate = 15; |
+ requested_settings_.resolution_change_policy = |
+ media::RESOLUTION_POLICY_FIXED_RESOLUTION; |
+ requested_settings_.power_line_frequency = |
+ media::PowerLineFrequency::FREQUENCY_DEFAULT; |
mock_receiver_ = base::MakeUnique<MockVideoFrameReceiver>( |
mojo::GetProxy(&mock_receiver_proxy_)); |