Do not hash default and communications media device ID

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 aefe67af541c120d993ca14d657794ee1d4d9d92..876e12acdb48f95f64df236dba7fcc9bbdad9ca8 100644
--- a/content/public/browser/media_device_id.cc
+++ b/content/public/browser/media_device_id.cc
@@ -3,39 +3,24 @@
 // found in the LICENSE file.
 #include "content/public/browser/media_device_id.h"
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
-#include "crypto/hmac.h"
 
 namespace content {
 
 std::string GetHMACForMediaDeviceID(const ResourceContext::SaltCallback& sc,
                                     const GURL& security_origin,
                                     const std::string& raw_unique_id) {
-  DCHECK(security_origin.is_valid());
-  DCHECK(!raw_unique_id.empty());
-  crypto::HMAC hmac(crypto::HMAC::SHA256);
-  const size_t digest_length = hmac.DigestLength();
-  std::vector<uint8> digest(digest_length);
-  std::string salt = sc.Run();
-  bool result = hmac.Init(security_origin.spec()) &&
-      hmac.Sign(raw_unique_id + salt, &digest[0], digest.size());
-  DCHECK(result);
-  return base::ToLowerASCII(base::HexEncode(&digest[0], digest.size()));
+  return MediaStreamManager::GetHMACForMediaDeviceID(sc, security_origin,
+                                                     raw_unique_id);
 }
 
 bool DoesMediaDeviceIDMatchHMAC(const ResourceContext::SaltCallback& sc,
                                 const GURL& security_origin,
                                 const std::string& device_guid,
                                 const std::string& raw_unique_id) {
-  DCHECK(security_origin.is_valid());
-  DCHECK(!raw_unique_id.empty());
-  std::string guid_from_raw_device_id =
-      GetHMACForMediaDeviceID(sc, security_origin, raw_unique_id);
-  return guid_from_raw_device_id == device_guid;
+  return MediaStreamManager::DoesMediaDeviceIDMatchHMAC(
+      sc, security_origin, device_guid, raw_unique_id);
 }
 
 bool GetMediaDeviceIDForHMAC(MediaStreamType stream_type,