| Index: chrome/browser/content_settings/host_content_settings_map.cc
|
| diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
|
| index fad7c9de75d13e7a2d617e7a4145ed99d524a51a..454faf6b50b208b98299d4bc79959035a1e2affb 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -138,7 +138,7 @@ void HostContentSettingsMap::RegisterExtensionService(
|
| #endif
|
|
|
| // static
|
| -void HostContentSettingsMap::RegisterUserPrefs(
|
| +void HostContentSettingsMap::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| registry->RegisterIntegerPref(
|
| prefs::kContentSettingsWindowLastTabIndex,
|
| @@ -154,9 +154,9 @@ void HostContentSettingsMap::RegisterUserPrefs(
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
|
|
| // Register the prefs for the content settings providers.
|
| - content_settings::DefaultProvider::RegisterUserPrefs(registry);
|
| - content_settings::PrefProvider::RegisterUserPrefs(registry);
|
| - content_settings::PolicyProvider::RegisterUserPrefs(registry);
|
| + content_settings::DefaultProvider::RegisterProfilePrefs(registry);
|
| + content_settings::PrefProvider::RegisterProfilePrefs(registry);
|
| + content_settings::PolicyProvider::RegisterProfilePrefs(registry);
|
| }
|
|
|
| ContentSetting HostContentSettingsMap::GetDefaultContentSettingFromProvider(
|
|
|