Revert of Make default media device ID salts random by default

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Index: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index f0b232dc977319db06d06cf60bbdc21e9a1600aa..467e2be3645b9d8010a85a3cb2654f10efc9873c 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -66,13 +66,13 @@
                         AudioMirroringManager* mirroring_manager,
                         MediaInternals* media_internals,
                         MediaStreamManager* media_stream_manager,
-                        const std::string& salt)
+                        const ResourceContext::SaltCallback& salt_callback)
       : AudioRendererHost(kRenderProcessId,
                           audio_manager,
                           mirroring_manager,
                           media_internals,
                           media_stream_manager,
-                          salt),
+                          salt_callback),
         shared_memory_length_(0) {}
 
   // A list of mock methods.
@@ -170,12 +170,18 @@
 };
 
 namespace {
+std::string ReturnMockSalt() {
+  return std::string();
+}
+
+ResourceContext::SaltCallback GetMockSaltCallback() {
+  return base::Bind(&ReturnMockSalt);
+}
 
 void WaitForEnumeration(base::RunLoop* loop,
                         const AudioOutputDeviceEnumeration& e) {
   loop->Quit();
 }
-
 }  // namespace
 
 class AudioRendererHostTest : public testing::Test {
@@ -196,10 +202,10 @@
         base::Bind(&WaitForEnumeration, &run_loop));
     run_loop.Run();
 
-    host_ =
-        new MockAudioRendererHost(audio_manager_.get(), &mirroring_manager_,
-                                  MediaInternals::GetInstance(),
-                                  media_stream_manager_.get(), std::string());
+    host_ = new MockAudioRendererHost(audio_manager_.get(), &mirroring_manager_,
+                                      MediaInternals::GetInstance(),
+                                      media_stream_manager_.get(),
+                                      GetMockSaltCallback());
 
     // Simulate IPC channel connected.
     host_->set_peer_process_for_testing(base::Process::Current());