| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 9b1e6cd86dd754401c91d22013d21c33cab18cf3..ba86825690a2fb338553c45d2464d56aa5c2ca00 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -27,7 +27,6 @@
|
| #include "chrome/browser/intranet_redirect_detector.h"
|
| #include "chrome/browser/io_thread.h"
|
| #include "chrome/browser/media/media_capture_devices_dispatcher.h"
|
| -#include "chrome/browser/media/media_device_id_salt.h"
|
| #include "chrome/browser/media/media_stream_devices_controller.h"
|
| #include "chrome/browser/metrics/chrome_metrics_service_client.h"
|
| #include "chrome/browser/net/http_server_properties_manager_factory.h"
|
| @@ -73,6 +72,7 @@
|
| #include "components/dom_distiller/core/distilled_page_prefs.h"
|
| #include "components/flags_ui/pref_service_flags_storage.h"
|
| #include "components/gcm_driver/gcm_channel_status_syncer.h"
|
| +#include "components/media_device_id_salt/media_device_id_salt.h"
|
| #include "components/metrics/metrics_service.h"
|
| #include "components/network_time/network_time_tracker.h"
|
| #include "components/ntp_snippets/ntp_snippets_service.h"
|
| @@ -425,7 +425,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| InstantUI::RegisterProfilePrefs(registry);
|
| NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
|
| MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
|
| - MediaDeviceIDSalt::RegisterProfilePrefs(registry);
|
| + media_device_id_salt::MediaDeviceIDSalt::RegisterProfilePrefs(registry);
|
| MediaStreamDevicesController::RegisterProfilePrefs(registry);
|
| NetPrefObserver::RegisterProfilePrefs(registry);
|
| ntp_snippets::NTPSnippetsService::RegisterProfilePrefs(registry);
|
|
|