| Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
|
| index f428ee09701e04221b676dbccf83bdc61cb17270..d7981ea8a5191d185af996cf9f12d7f56f0d7fe2 100644
|
| --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
|
| @@ -14,8 +14,10 @@ namespace content {
|
|
|
| MediaStreamDispatcherHost::MediaStreamDispatcherHost(
|
| int render_process_id,
|
| + ResourceContext* resource_context,
|
| MediaStreamManager* media_stream_manager)
|
| : render_process_id_(render_process_id),
|
| + resource_context_(resource_context),
|
| media_stream_manager_(media_stream_manager) {
|
| }
|
|
|
| @@ -131,7 +133,8 @@ void MediaStreamDispatcherHost::OnGenerateStream(
|
| << security_origin.spec() << ")";
|
|
|
| const std::string& label = media_stream_manager_->GenerateStream(
|
| - this, render_process_id_, render_view_id, page_request_id,
|
| + this, render_process_id_, render_view_id, resource_context_,
|
| + page_request_id,
|
| components, security_origin);
|
| CHECK(!label.empty());
|
| StoreRequest(render_view_id, page_request_id, label);
|
| @@ -176,8 +179,8 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
|
| << security_origin.spec() << ")";
|
|
|
| const std::string& label = media_stream_manager_->EnumerateDevices(
|
| - this, render_process_id_, render_view_id, page_request_id,
|
| - type, security_origin);
|
| + this, render_process_id_, render_view_id, resource_context_,
|
| + page_request_id, type, security_origin);
|
| StoreRequest(render_view_id, page_request_id, label);
|
| }
|
|
|
| @@ -206,8 +209,8 @@ void MediaStreamDispatcherHost::OnOpenDevice(
|
| << security_origin.spec() << ")";
|
|
|
| const std::string& label = media_stream_manager_->OpenDevice(
|
| - this, render_process_id_, render_view_id, page_request_id,
|
| - device_id, type, security_origin);
|
| + this, render_process_id_, render_view_id, resource_context_,
|
| + page_request_id, device_id, type, security_origin);
|
| StoreRequest(render_view_id, page_request_id, label);
|
| }
|
|
|
|
|