| Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/media/media_stream_dispatcher_host.cc (revision 278172)
|
| +++ content/browser/renderer_host/media/media_stream_dispatcher_host.cc (working copy)
|
| @@ -16,13 +16,11 @@
|
| MediaStreamDispatcherHost::MediaStreamDispatcherHost(
|
| int render_process_id,
|
| const ResourceContext::SaltCallback& salt_callback,
|
| - MediaStreamManager* media_stream_manager,
|
| - ResourceContext* resource_context)
|
| + MediaStreamManager* media_stream_manager)
|
| : BrowserMessageFilter(MediaStreamMsgStart),
|
| render_process_id_(render_process_id),
|
| salt_callback_(salt_callback),
|
| - media_stream_manager_(media_stream_manager),
|
| - resource_context_(resource_context) {
|
| + media_stream_manager_(media_stream_manager) {
|
| }
|
|
|
| void MediaStreamDispatcherHost::StreamGenerated(
|
| @@ -180,15 +178,9 @@
|
| if (!IsURLAllowed(security_origin))
|
| return;
|
|
|
| - DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
|
| - type == MEDIA_DEVICE_VIDEO_CAPTURE);
|
| - bool have_permission = type == MEDIA_DEVICE_AUDIO_CAPTURE ?
|
| - resource_context_->AllowMicAccess(security_origin) :
|
| - resource_context_->AllowCameraAccess(security_origin);
|
| -
|
| media_stream_manager_->EnumerateDevices(
|
| this, render_process_id_, render_view_id, salt_callback_,
|
| - page_request_id, type, security_origin, have_permission);
|
| + page_request_id, type, security_origin);
|
| }
|
|
|
| void MediaStreamDispatcherHost::OnCancelEnumerateDevices(
|
|
|