| 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 b4a18cf2602050f578859f90c69ddce5f0724c48..f6304a1af38f3fa775f17a02fa17b188630e623a 100644
|
| --- a/chrome/browser/content_settings/content_settings_default_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_default_provider.cc
|
| @@ -87,7 +87,7 @@ class DefaultRuleIterator : public RuleIterator {
|
| } // namespace
|
|
|
| // static
|
| -void DefaultProvider::RegisterUserPrefs(PrefService* prefs) {
|
| +void DefaultProvider::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| // 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
|
| @@ -97,7 +97,7 @@ void DefaultProvider::RegisterUserPrefs(PrefService* prefs) {
|
| DictionaryValue* default_content_settings = new DictionaryValue();
|
| prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings,
|
| default_content_settings,
|
| - PrefService::SYNCABLE_PREF);
|
| + PrefServiceSyncable::SYNCABLE_PREF);
|
| }
|
|
|
| DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)
|
|
|