| Index: chrome/browser/content_settings/content_settings_default_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
|
| index 67a5f9df2c5ba46d37f78b4b6be4b8771ced265d..51592fa23dfed165529f4c1327c65b1a8492813d 100644
|
| --- a/chrome/browser/content_settings/content_settings_default_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_default_provider.cc
|
| @@ -87,7 +87,8 @@ class DefaultRuleIterator : public RuleIterator {
|
| } // namespace
|
|
|
| // static
|
| -void DefaultProvider::RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| +void DefaultProvider::RegisterUserPrefs(
|
| + user_prefs::PrefRegistrySyncable* registry) {
|
| // The registration of the preference prefs::kDefaultContentSettings should
|
| // also include the default values for default content settings. This allows
|
| // functional tests to get default content settings by reading the preference
|
| @@ -95,9 +96,10 @@ void DefaultProvider::RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| // TODO(markusheintz): Write pyauto hooks for the content settings map as
|
| // content settings should be read from the host content settings map.
|
| DictionaryValue* default_content_settings = new DictionaryValue();
|
| - registry->RegisterDictionaryPref(prefs::kDefaultContentSettings,
|
| - default_content_settings,
|
| - PrefRegistrySyncable::SYNCABLE_PREF);
|
| + registry->RegisterDictionaryPref(
|
| + prefs::kDefaultContentSettings,
|
| + default_content_settings,
|
| + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| }
|
|
|
| DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)
|
|
|