Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / media / media_stream_dispatcher_host.cc

diff --git a/src/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/src/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index 8ea1617..68f1c36 100644 (file)
--- a/src/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/src/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -14,10 +14,10 @@ namespace content {
 
 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
     int render_process_id,
-    ResourceContext* resource_context,
+    const ResourceContext::SaltCallback& salt_callback,
     MediaStreamManager* media_stream_manager)
     : render_process_id_(render_process_id),
-      resource_context_(resource_context),
+      salt_callback_(salt_callback),
       media_stream_manager_(media_stream_manager) {
 }
 
@@ -131,9 +131,8 @@ void MediaStreamDispatcherHost::OnGenerateStream(
            << security_origin.spec() << ")";
 
   media_stream_manager_->GenerateStream(
-      this, render_process_id_, render_view_id, resource_context_,
-      page_request_id,
-      components, security_origin);
+      this, render_process_id_, render_view_id, salt_callback_,
+      page_request_id, components, security_origin);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
@@ -167,7 +166,7 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
            << security_origin.spec() << ")";
 
   media_stream_manager_->EnumerateDevices(
-      this, render_process_id_, render_view_id, resource_context_,
+      this, render_process_id_, render_view_id, salt_callback_,
       page_request_id, type, security_origin);
 }
 
@@ -195,7 +194,7 @@ void MediaStreamDispatcherHost::OnOpenDevice(
            << security_origin.spec() << ")";
 
   media_stream_manager_->OpenDevice(
-      this, render_process_id_, render_view_id, resource_context_,
+      this, render_process_id_, render_view_id, salt_callback_,
       page_request_id, device_id, type, security_origin);
 
 }