| Index: chrome/browser/pepper_flash_settings_manager.cc
|
| diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc
|
| index 7dad61977f7e9be25dbb39efea93d46a3f4bba48..eb64b49fe8cbbf2fe4218494d804b2bf70187422 100644
|
| --- a/chrome/browser/pepper_flash_settings_manager.cc
|
| +++ b/chrome/browser/pepper_flash_settings_manager.cc
|
| @@ -970,15 +970,9 @@ bool PepperFlashSettingsManager::IsPepperFlashInUse(
|
| // static
|
| void PepperFlashSettingsManager::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| - registry->RegisterBooleanPref(
|
| - prefs::kDeauthorizeContentLicenses,
|
| - false,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| -
|
| - registry->RegisterBooleanPref(
|
| - prefs::kPepperFlashSettingsEnabled,
|
| - true,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(prefs::kDeauthorizeContentLicenses, false);
|
| +
|
| + registry->RegisterBooleanPref(prefs::kPepperFlashSettingsEnabled, true);
|
| }
|
|
|
| uint32 PepperFlashSettingsManager::DeauthorizeContentLicenses(
|
|
|