Make default media device ID salts random by default

content/shell/browser/shell_browser_context.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/shell_browser_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 15 matching lines @@
 #include "base/base_paths_win.h"
 #elif defined(OS_LINUX)
 #include "base/nix/xdg_util.h"
 #elif defined(OS_MACOSX)
 #include "base/base_paths_mac.h"
 #endif
 
 namespace content {
 
 ShellBrowserContext::ShellResourceContext::ShellResourceContext()
-    : getter_(NULL) {
-}
+    : getter_(NULL), media_device_id_salt_(CreateRandomMediaDeviceIDSalt()) {}
 
 ShellBrowserContext::ShellResourceContext::~ShellResourceContext() {
 }
 
 net::HostResolver*
 ShellBrowserContext::ShellResourceContext::GetHostResolver() {
   CHECK(getter_);
   return getter_->host_resolver();
 }
 
 net::URLRequestContext*
 ShellBrowserContext::ShellResourceContext::GetRequestContext() {
   CHECK(getter_);
   return getter_->GetURLRequestContext();
 }
 
+ResourceContext::SaltCallback
+ShellBrowserContext::ShellResourceContext::GetMediaDeviceIDSalt() {
+  return CreateSaltCallback(media_device_id_salt_);
+}
+
 ShellBrowserContext::ShellBrowserContext(bool off_the_record,
                                          net::NetLog* net_log)
     : resource_context_(new ShellResourceContext),
       ignore_certificate_errors_(false),
       off_the_record_(off_the_record),
       net_log_(net_log),
       guest_manager_(NULL) {
   InitWhileIOAllowed();
 }
 
@@ skipping 130 matching lines @@
   return permission_manager_.get();
 }
 
 BackgroundSyncController* ShellBrowserContext::GetBackgroundSyncController() {
   if (!background_sync_controller_)
     background_sync_controller_.reset(new MockBackgroundSyncController());
   return background_sync_controller_.get();
 }
 
 }  // namespace content