Implement a salt for MediaSource IDs that can be cleared by a user.

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 99f3793c0157f18618222399755b10c33e6dcb0b..bd92bc948594ea2d5f3040696a87b562d1237423 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -35,6 +35,7 @@
 #include "chrome/browser/extensions/extension_resource_protocols.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/io_thread.h"
+#include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/net/about_protocol_handler.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
@@ -313,6 +314,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   printing_enabled_.Init(prefs::kPrintingEnabled, pref_service);
   printing_enabled_.MoveToThread(io_message_loop_proxy);
 #endif
+
   chrome_http_user_agent_settings_.reset(
       new ChromeHttpUserAgentSettings(pref_service));
 
@@ -344,6 +346,9 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
     signin_allowed_.MoveToThread(io_message_loop_proxy);
   }
 
+  media_device_id_salt_.reset(new MediaDeviceIDSalt(pref_service,
+                                                    is_incognito()));
+
   // The URLBlacklistManager has to be created on the UI thread to register
   // observers of |pref_service|, and it also has to clean up on
   // ShutdownOnUIThread to release these observers on the right thread.
@@ -643,6 +648,10 @@ DesktopNotificationService* ProfileIOData::GetNotificationService() const {
 }
 #endif
 
+const std::string& ProfileIOData::media_device_id_salt() const {
+  return media_device_id_salt_->GetSalt();

[Jói, 2013/10/31 16:14:47]

If you name your method using Linux hacker style (media_device_id_salt) then it
is supposed to be a simple accessor for the member named similarly
(media_device_id_salt_).

I would suggest actually returning the MediaDeviceIDSalt object here, rather
than calling GetSalt() on behalf of the caller.

Alternatively, leave as is and rename to GetMediaDeviceIDSalt.

[perkj_chrome, 2013/10/31 17:05:44]

Done.

+}
+
 void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_CHROMEOS)
@@ -931,6 +940,7 @@ void ProfileIOData::ShutdownOnUIThread() {
   printing_enabled_.Destroy();
   sync_disabled_.Destroy();
   signin_allowed_.Destroy();
+  media_device_id_salt_.reset(NULL);
   session_startup_pref_.Destroy();
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url_blacklist_manager_)