Index: content/browser/renderer_host/media/device_request_message_filter.cc |
diff --git a/content/browser/renderer_host/media/device_request_message_filter.cc b/content/browser/renderer_host/media/device_request_message_filter.cc |
index 4aaf2398d5593685ee4bf9501f928bfbe16d5876..ad71a0ca203eae96552043afa30cbe0bcbf9e349 100644 |
--- a/content/browser/renderer_host/media/device_request_message_filter.cc |
+++ b/content/browser/renderer_host/media/device_request_message_filter.cc |
@@ -111,8 +111,6 @@ void DeviceRequestMessageFilter::DevicesEnumerated( |
Send(new MediaStreamMsg_GetSourcesACK(request_it->request_id, all_devices)); |
- media_stream_manager_->CancelRequest(request_it->audio_devices_label); |
- media_stream_manager_->CancelRequest(request_it->video_devices_label); |
requests_.erase(request_it); |
} |
@@ -147,13 +145,15 @@ void DeviceRequestMessageFilter::OnGetSources(int request_id, |
// Make request to get audio devices. |
const std::string& audio_label = media_stream_manager_->EnumerateDevices( |
this, -1, -1, resource_context_->GetMediaDeviceIDSalt(), -1, |
- MEDIA_DEVICE_AUDIO_CAPTURE, security_origin); |
+ MEDIA_DEVICE_AUDIO_CAPTURE, security_origin, |
+ resource_context_->AllowMicAccess(security_origin)); |
DCHECK(!audio_label.empty()); |
// Make request for video devices. |
const std::string& video_label = media_stream_manager_->EnumerateDevices( |
this, -1, -1, resource_context_->GetMediaDeviceIDSalt(), -1, |
- MEDIA_DEVICE_VIDEO_CAPTURE, security_origin); |
+ MEDIA_DEVICE_VIDEO_CAPTURE, security_origin, |
+ resource_context_->AllowCameraAccess(security_origin)); |
DCHECK(!video_label.empty()); |
requests_.push_back(DeviceRequest( |