| Index: chrome/browser/plugins/plugin_prefs_factory.cc
|
| diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| index 9f297184638584d0cc18675054dddd79769d239a..e1e3ba941907d6ca60d85e817e03918b87441d1a 100644
|
| --- a/chrome/browser/plugins/plugin_prefs_factory.cc
|
| +++ b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| @@ -47,29 +47,29 @@ PluginPrefsFactory::BuildServiceInstanceFor(Profile* profile) const {
|
| return plugin_prefs;
|
| }
|
|
|
| -void PluginPrefsFactory::RegisterUserPrefs(PrefService* prefs) {
|
| +void PluginPrefsFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| FilePath internal_dir;
|
| PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
|
| prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
|
| internal_dir,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
|
| false,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterBooleanPref(prefs::kPluginsEnabledNaCl,
|
| false,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterBooleanPref(prefs::kPluginsMigratedToPepperFlash,
|
| false,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kPluginsPluginsList,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kPluginsDisabledPlugins,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterListPref(prefs::kPluginsEnabledPlugins,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| bool PluginPrefsFactory::ServiceRedirectedInIncognito() const {
|
|
|