| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index e4347f8edd524a8b1ac01c4988b837de54b0225c..4a69ad47ac3a8e97a0acd1c9e4192201263a6e33 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -47,6 +47,7 @@
|
| #include "chrome/browser/guestview/guestview_constants.h"
|
| #include "chrome/browser/guestview/webview/webview_guest.h"
|
| #include "chrome/browser/media/media_capture_devices_dispatcher.h"
|
| +#include "chrome/browser/media/media_device_id_salt.h"
|
| #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"
|
| #include "chrome/browser/nacl_host/nacl_browser.h"
|
| #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
|
| @@ -2380,6 +2381,13 @@ std::string ChromeContentBrowserClient::GetDefaultDownloadName() {
|
| return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
|
| }
|
|
|
| +std::string ChromeContentBrowserClient::GetMediaDeviceIDSalt(
|
| + content::ResourceContext* rc) {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| + ProfileIOData* io_data = ProfileIOData::FromResourceContext(rc);
|
| + return io_data->GetMediaDeviceIDSalt();
|
| +}
|
| +
|
| void ChromeContentBrowserClient::DidCreatePpapiPlugin(
|
| content::BrowserPpapiHost* browser_host) {
|
| #if defined(ENABLE_PLUGINS)
|
|
|