| Index: chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/api/permissions/permissions_api_helpers.cc (revision 247036)
|
| +++ chrome/browser/extensions/api/permissions/permissions_api_helpers.cc (working copy)
|
| @@ -71,6 +71,7 @@
|
| const Permissions& permissions,
|
| bool allow_file_access,
|
| std::string* error) {
|
| + DCHECK(error);
|
| APIPermissionSet apis;
|
| std::vector<std::string>* permissions_list = permissions.permissions.get();
|
| if (permissions_list) {
|
| @@ -107,7 +108,7 @@
|
| }
|
|
|
| CHECK(permission);
|
| - if (!permission->FromValue(permission_json.get())) {
|
| + if (!permission->FromValue(permission_json.get(), NULL)) {
|
| *error = ErrorUtils::FormatErrorMessage(kInvalidParameter, *it);
|
| return NULL;
|
| }
|
|
|