Allow retrieval of media device ID salt even after ResourceContext has gone away.

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
@@ skipping 113 matching lines @@
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
            << render_view_id << ", "
            << page_request_id << ", ["
            << " audio:" << components.audio_requested
            << " video:" << components.video_requested
            << " ], "
            << security_origin.spec() << ")";
 
   media_stream_manager_->GenerateStream(
-      this, render_process_id_, render_view_id, resource_context_,
+      this, render_process_id_, render_view_id,
+      resource_context_->GetMediaDeviceIDSalt(),
       page_request_id,
       components, security_origin);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
                                                        int page_request_id) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
            << render_view_id << ", "
            << page_request_id << ")";
   media_stream_manager_->CancelRequest(render_process_id_, render_view_id,
@@ skipping 15 matching lines @@
     int page_request_id,
     MediaStreamType type,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("
            << render_view_id << ", "
            << page_request_id << ", "
            << type << ", "
            << security_origin.spec() << ")";
 
   media_stream_manager_->EnumerateDevices(
-      this, render_process_id_, render_view_id, resource_context_,
+      this, render_process_id_, render_view_id,
+      resource_context_->GetMediaDeviceIDSalt(),
       page_request_id, type, security_origin);
 }
 
 void MediaStreamDispatcherHost::OnCancelEnumerateDevices(
     int render_view_id,
     int page_request_id) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices("
            << render_view_id << ", "
            << page_request_id << ")";
   media_stream_manager_->CancelRequest(render_process_id_, render_view_id,
                                        page_request_id);
 }
 
 void MediaStreamDispatcherHost::OnOpenDevice(
     int render_view_id,
     int page_request_id,
     const std::string& device_id,
     MediaStreamType type,
     const GURL& security_origin) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnOpenDevice("
            << render_view_id << ", "
            << page_request_id << ", device_id: "
            << device_id.c_str() << ", type: "
            << type << ", "
            << security_origin.spec() << ")";
 
   media_stream_manager_->OpenDevice(
-      this, render_process_id_, render_view_id, resource_context_,
+      this, render_process_id_, render_view_id,
+      resource_context_->GetMediaDeviceIDSalt(),
       page_request_id, device_id, type, security_origin);
 
 }
 
 void MediaStreamDispatcherHost::OnCloseDevice(
     int render_view_id,
     const std::string& label) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnCloseDevice("
            << render_view_id << ", "
            << label << ")";
 
   media_stream_manager_->CancelRequest(label);
 }
 
 }  // namespace content