From 3e7756c7d39828136744fe7dffe1104eb5433843 Mon Sep 17 00:00:00 2001 From: treib Date: Tue, 8 Mar 2016 08:30:13 -0800 Subject: Cleanup: remove evil hack to suppress permission warnings for searchProvider BUG=533086 Review URL: https://codereview.chromium.org/1774103002 Cr-Commit-Position: refs/heads/master@{#379840} --- extensions/common/permissions/settings_override_permission.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'extensions/common') diff --git a/extensions/common/permissions/settings_override_permission.cc b/extensions/common/permissions/settings_override_permission.cc index 43765d2..69318d829 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* 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 SettingsOverrideAPIPermission::ToValue() const { -- cgit v1.1