Reland of Make default media device ID salts random by default

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

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 8fa0e0449db0789731df399848946521312f1c83..dcab5d412b98e794f93567b1cc3da3a983b808b8 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -20,12 +20,12 @@ namespace content {
 
 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
     int render_process_id,
-    const ResourceContext::SaltCallback& salt_callback,
+    const std::string& salt,
     MediaStreamManager* media_stream_manager,
     bool use_fake_ui)
     : BrowserMessageFilter(MediaStreamMsgStart),
       render_process_id_(render_process_id),
-      salt_callback_(salt_callback),
+      salt_(salt),
       media_stream_manager_(media_stream_manager),
       use_fake_ui_(use_fake_ui),
       weak_factory_(this) {}
@@ -167,8 +167,8 @@ void MediaStreamDispatcherHost::OnGenerateStream(
     return;
 
   media_stream_manager_->GenerateStream(
-      this, render_process_id_, render_frame_id, salt_callback_,
-      page_request_id, controls, security_origin, user_gesture);
+      this, render_process_id_, render_frame_id, salt_, page_request_id,
+      controls, security_origin, user_gesture);
 }
 
 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_frame_id,
@@ -203,8 +203,8 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
     return;
 
   media_stream_manager_->EnumerateDevices(
-      this, render_process_id_, render_frame_id, salt_callback_,
-      page_request_id, type, security_origin);
+      this, render_process_id_, render_frame_id, salt_, page_request_id, type,
+      security_origin);
 }
 
 void MediaStreamDispatcherHost::OnCancelEnumerateDevices(
@@ -230,9 +230,9 @@ void MediaStreamDispatcherHost::OnOpenDevice(
   if (!MediaStreamManager::IsOriginAllowed(render_process_id_, security_origin))
     return;
 
-  media_stream_manager_->OpenDevice(
-      this, render_process_id_, render_frame_id, salt_callback_,
-      page_request_id, device_id, type, security_origin);
+  media_stream_manager_->OpenDevice(this, render_process_id_, render_frame_id,
+                                    salt_, page_request_id, device_id, type,
+                                    security_origin);
 }
 
 void MediaStreamDispatcherHost::OnCloseDevice(