| Index: content/renderer/media/user_media_client_impl_unittest.cc
|
| diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc
|
| index f01ef2dc546bfa9c9bd4d1e102123093cd4f04a3..d1f555992e6d7655fbe94a8470fe0387b69c4604 100644
|
| --- a/content/renderer/media/user_media_client_impl_unittest.cc
|
| +++ b/content/renderer/media/user_media_client_impl_unittest.cc
|
| @@ -119,7 +119,7 @@ class MockMediaDevicesDispatcherHost
|
| bool request_video_input,
|
| bool request_audio_output,
|
| const url::Origin& security_origin,
|
| - const EnumerateDevicesCallback& callback) override {
|
| + EnumerateDevicesCallback callback) override {
|
| std::vector<std::vector<MediaDeviceInfo>> result(NUM_MEDIA_DEVICE_TYPES);
|
| if (request_audio_input) {
|
| result[MEDIA_DEVICE_TYPE_AUDIO_INPUT].push_back(MediaDeviceInfo(
|
| @@ -137,12 +137,12 @@ class MockMediaDevicesDispatcherHost
|
| result[MEDIA_DEVICE_TYPE_AUDIO_OUTPUT].push_back(MediaDeviceInfo(
|
| kFakeAudioOutputDeviceId1, "Fake Audio Input 1", "fake_group 1"));
|
| }
|
| - callback.Run(result);
|
| + std::move(callback).Run(result);
|
| }
|
|
|
| void GetVideoInputCapabilities(
|
| const url::Origin& security_origin,
|
| - const GetVideoInputCapabilitiesCallback& client_callback) override {
|
| + GetVideoInputCapabilitiesCallback client_callback) override {
|
| ::mojom::VideoInputDeviceCapabilitiesPtr device =
|
| ::mojom::VideoInputDeviceCapabilities::New();
|
| device->device_id = kFakeVideoInputDeviceId1;
|
| @@ -159,7 +159,7 @@ class MockMediaDevicesDispatcherHost
|
| gfx::Size(640, 480), 30.0f, media::PIXEL_FORMAT_I420));
|
| result.push_back(std::move(device));
|
|
|
| - client_callback.Run(std::move(result));
|
| + std::move(client_callback).Run(std::move(result));
|
| }
|
|
|
| MOCK_METHOD3(SubscribeDeviceChangeNotifications,
|
|
|