| Index: services/video_capture/fake_device_test.cc
|
| diff --git a/services/video_capture/fake_device_test.cc b/services/video_capture/fake_device_test.cc
|
| index 452cdcb927939f587fb958e9003c72c78cc335ae..bcdfeef8f92fa377d65349fa8f36f017a779eebe 100644
|
| --- a/services/video_capture/fake_device_test.cc
|
| +++ b/services/video_capture/fake_device_test.cc
|
| @@ -22,23 +22,22 @@ void FakeDeviceTest::SetUp() {
|
| base::RunLoop wait_loop;
|
| EXPECT_CALL(supported_formats_receiver_, OnGetSupportedFormatsCallback(_))
|
| .WillOnce(Invoke([this, &wait_loop](
|
| - const std::vector<mojom::VideoCaptureFormatPtr>&
|
| + const std::vector<media::VideoCaptureFormat>&
|
| formats) {
|
| - fake_device_first_supported_format_ = formats[0].Clone();
|
| + fake_device_first_supported_format_ = formats[0];
|
| wait_loop.Quit();
|
| }));
|
| factory_->GetSupportedFormats(
|
| - fake_device_descriptor_.Clone(),
|
| - base::Bind(&MockSupportedFormatsReceiver::HandleGetSupportedFormatsCallback,
|
| + fake_device_descriptor_,
|
| + base::Bind(&MockSupportedFormatsReceiver::OnGetSupportedFormatsCallback,
|
| base::Unretained(&supported_formats_receiver_)));
|
| wait_loop.Run();
|
|
|
| - requestable_settings_ = mojom::VideoCaptureSettings::New();
|
| - requestable_settings_->format = fake_device_first_supported_format_.Clone();
|
| - requestable_settings_->resolution_change_policy =
|
| - mojom::ResolutionChangePolicy::FIXED_RESOLUTION;
|
| - requestable_settings_->power_line_frequency =
|
| - mojom::PowerLineFrequency::DEFAULT;
|
| + requestable_settings_.requested_format = fake_device_first_supported_format_;
|
| + requestable_settings_.resolution_change_policy =
|
| + media::RESOLUTION_POLICY_FIXED_RESOLUTION;
|
| + requestable_settings_.power_line_frequency =
|
| + media::PowerLineFrequency::FREQUENCY_DEFAULT;
|
|
|
| factory_->CreateDeviceProxy(
|
| std::move(fake_device_descriptor_), mojo::GetProxy(&fake_device_proxy_),
|
|
|