Make default media device ID salts random by default

chrome/browser/media/media_device_id_salt.cc

Index: chrome/browser/media/media_device_id_salt.cc
diff --git a/chrome/browser/media/media_device_id_salt.cc b/chrome/browser/media/media_device_id_salt.cc
index 2220418e031c0f21a713d886d5eacaaa2903f2f9..15c50f9ff40351185533f9b387b16c1576b2045b 100644
--- a/chrome/browser/media/media_device_id_salt.cc
+++ b/chrome/browser/media/media_device_id_salt.cc
@@ -9,32 +9,23 @@
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/resource_context.h"
 
 using content::BrowserThread;
 
-namespace {
-
-std::string CreateSalt() {
-  std::string salt;
-  base::Base64Encode(base::RandBytesAsString(16), &salt);
-  DCHECK(!salt.empty());
-  return salt;
-}
-
-}  // namespace
-
 MediaDeviceIDSalt::MediaDeviceIDSalt(PrefService* pref_service,
                                      bool incognito) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (incognito) {
-    incognito_salt_ = CreateSalt();
+    incognito_salt_ = content::ResourceContext::CreateRandomMediaDeviceIDSalt();
     return;
   }
 
   media_device_id_salt_.Init(prefs::kMediaDeviceIdSalt, pref_service);
   if (media_device_id_salt_.GetValue().empty())
-    media_device_id_salt_.SetValue(CreateSalt());
+    media_device_id_salt_.SetValue(
+        content::ResourceContext::CreateRandomMediaDeviceIDSalt());
 
   media_device_id_salt_.MoveToThread(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
@@ -62,6 +53,7 @@ void MediaDeviceIDSalt::RegisterProfilePrefs(
 }
 
 void MediaDeviceIDSalt::Reset(PrefService* pref_service) {
-  pref_service->SetString(prefs::kMediaDeviceIdSalt,
-                          CreateSalt());
+  pref_service->SetString(
+      prefs::kMediaDeviceIdSalt,
+      content::ResourceContext::CreateRandomMediaDeviceIDSalt());
 }