| Index: extensions/common/permissions/settings_override_permission.cc
|
| diff --git a/extensions/common/permissions/settings_override_permission.cc b/extensions/common/permissions/settings_override_permission.cc
|
| index 43765d20510d52e345141b05228e75611503c64c..69318d829392a26583bb2d6e52edb06856a5d42a 100644
|
| --- a/extensions/common/permissions/settings_override_permission.cc
|
| +++ b/extensions/common/permissions/settings_override_permission.cc
|
| @@ -48,14 +48,7 @@ bool SettingsOverrideAPIPermission::FromValue(
|
| const base::Value* value,
|
| std::string* /*error*/,
|
| std::vector<std::string>* unhandled_permissions) {
|
| - // Ugly hack: |value| being null should be an error. But before M46 beta, we
|
| - // didn't store the parameter for settings override permissions in prefs.
|
| - // See crbug.com/533086.
|
| - // TODO(treib,devlin): Remove this for M48, when hopefully all users will have
|
| - // updated prefs.
|
| - // This should read:
|
| - // return value && value->GetAsString(&setting_value_);
|
| - return !value || value->GetAsString(&setting_value_);
|
| + return value && value->GetAsString(&setting_value_);
|
| }
|
|
|
| scoped_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const {
|
|
|