Reland of Make default media device ID salts random by default

content/public/browser/media_device_id.cc

Index: content/public/browser/media_device_id.cc
diff --git a/content/public/browser/media_device_id.cc b/content/public/browser/media_device_id.cc
index d99d0f240c9a5ee21301299c71bd7132d22fa56f..97faa1e1a40ec9476959b9458e1d1e4345c98909 100644
--- a/content/public/browser/media_device_id.cc
+++ b/content/public/browser/media_device_id.cc
@@ -8,23 +8,23 @@
 
 namespace content {
 
-std::string GetHMACForMediaDeviceID(const ResourceContext::SaltCallback& sc,
+std::string GetHMACForMediaDeviceID(const std::string& salt,
                                     const url::Origin& security_origin,
                                     const std::string& raw_unique_id) {
-  return MediaStreamManager::GetHMACForMediaDeviceID(sc, security_origin,
+  return MediaStreamManager::GetHMACForMediaDeviceID(salt, security_origin,
                                                      raw_unique_id);
 }
 
-bool DoesMediaDeviceIDMatchHMAC(const ResourceContext::SaltCallback& sc,
+bool DoesMediaDeviceIDMatchHMAC(const std::string& salt,
                                 const url::Origin& security_origin,
                                 const std::string& device_guid,
                                 const std::string& raw_unique_id) {
   return MediaStreamManager::DoesMediaDeviceIDMatchHMAC(
-      sc, security_origin, device_guid, raw_unique_id);
+      salt, security_origin, device_guid, raw_unique_id);
 }
 
 bool GetMediaDeviceIDForHMAC(MediaStreamType stream_type,
-                             const ResourceContext::SaltCallback& rc,
+                             const std::string& salt,
                              const url::Origin& security_origin,
                              const std::string& source_id,
                              std::string* device_id) {
@@ -32,10 +32,7 @@ bool GetMediaDeviceIDForHMAC(MediaStreamType stream_type,
       content::BrowserMainLoop::GetInstance()->media_stream_manager();
 
   return manager->TranslateSourceIdToDeviceId(
-      content::MEDIA_DEVICE_VIDEO_CAPTURE,
-      rc,
-      security_origin,
-      source_id,
+      content::MEDIA_DEVICE_VIDEO_CAPTURE, salt, security_origin, source_id,
       device_id);
 }