| 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 f8fcfcf4e294fde8338ae4809d946a449becdcaf..a8702e208cf68abe4b345bc16fad048a4d13ab87 100644
|
| --- a/chrome/browser/media/media_device_id_salt.cc
|
| +++ b/chrome/browser/media/media_device_id_salt.cc
|
| @@ -8,8 +8,8 @@
|
| #include "chrome/browser/profiles/profile_io_data.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/prefs/pref_service.h"
|
| +#include "content/public/browser/browser_context.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/resource_context.h"
|
|
|
| using content::BrowserThread;
|
|
|
| @@ -19,18 +19,13 @@ MediaDeviceIDSalt::MediaDeviceIDSalt(PrefService* pref_service) {
|
| media_device_id_salt_.Init(prefs::kMediaDeviceIdSalt, pref_service);
|
| if (media_device_id_salt_.GetValue().empty()) {
|
| media_device_id_salt_.SetValue(
|
| - content::ResourceContext::CreateRandomMediaDeviceIDSalt());
|
| + content::BrowserContext::CreateRandomMediaDeviceIDSalt());
|
| }
|
| }
|
|
|
| MediaDeviceIDSalt::~MediaDeviceIDSalt() {
|
| }
|
|
|
| -void MediaDeviceIDSalt::ShutdownOnUIThread() {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - media_device_id_salt_.Destroy();
|
| -}
|
| -
|
| std::string MediaDeviceIDSalt::GetSalt() const {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| return media_device_id_salt_.GetValue();
|
| @@ -44,5 +39,5 @@ void MediaDeviceIDSalt::RegisterProfilePrefs(
|
| void MediaDeviceIDSalt::Reset(PrefService* pref_service) {
|
| pref_service->SetString(
|
| prefs::kMediaDeviceIdSalt,
|
| - content::ResourceContext::CreateRandomMediaDeviceIDSalt());
|
| + content::BrowserContext::CreateRandomMediaDeviceIDSalt());
|
| }
|
|
|