Revert of Make default media device ID salts random by default

content/browser/renderer_host/media/audio_renderer_host.cc

Index: content/browser/renderer_host/media/audio_renderer_host.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 947c00cd4331e84959852f61e8023fffb8a00680..0cf02958b073e8ae8218f66ad09a305215a643e7 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -194,12 +194,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 // AudioRendererHost implementations.
 
-AudioRendererHost::AudioRendererHost(int render_process_id,
-                                     media::AudioManager* audio_manager,
-                                     AudioMirroringManager* mirroring_manager,
-                                     MediaInternals* media_internals,
-                                     MediaStreamManager* media_stream_manager,
-                                     const std::string& salt)
+AudioRendererHost::AudioRendererHost(
+    int render_process_id,
+    media::AudioManager* audio_manager,
+    AudioMirroringManager* mirroring_manager,
+    MediaInternals* media_internals,
+    MediaStreamManager* media_stream_manager,
+    const ResourceContext::SaltCallback& salt_callback)
     : BrowserMessageFilter(AudioMsgStart),
       render_process_id_(render_process_id),
       audio_manager_(audio_manager),
@@ -208,7 +209,7 @@
           media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER)),
       media_stream_manager_(media_stream_manager),
       num_playing_streams_(0),
-      salt_(salt),
+      salt_callback_(salt_callback),
       max_simultaneous_streams_(0) {
   DCHECK(audio_manager_);
   DCHECK(media_stream_manager_);
@@ -435,7 +436,7 @@
       // Hash matched device id and pass it to the renderer
       Send(new AudioMsg_NotifyDeviceAuthorized(
           stream_id, media::OUTPUT_DEVICE_STATUS_OK, output_params,
-          GetHMACForMediaDeviceID(salt_, security_origin,
+          GetHMACForMediaDeviceID(salt_callback_, security_origin,
                                   info->device.matched_output_device_id)));
       return;
     }
@@ -794,8 +795,9 @@
         callback.Run(true, device_info);
         return;
       }
-    } else if (content::DoesMediaDeviceIDMatchHMAC(
-                   salt_, security_origin, device_id, device_info.unique_id)) {
+    } else if (content::DoesMediaDeviceIDMatchHMAC(salt_callback_,
+                                                   security_origin, device_id,
+                                                   device_info.unique_id)) {
       callback.Run(true, device_info);
       return;
     }