Index: extensions/common/permissions/api_permission_set.cc |
diff --git a/extensions/common/permissions/api_permission_set.cc b/extensions/common/permissions/api_permission_set.cc |
index d21ab439dea801adbc71857552e72ff23e562839..dd75242c114b470e67cf1fa14ff4bddd20e8cd11 100644 |
--- a/extensions/common/permissions/api_permission_set.cc |
+++ b/extensions/common/permissions/api_permission_set.cc |
@@ -106,15 +106,18 @@ bool ParseChildPermissions(const std::string& base_name, |
continue; |
} |
- if (!CreateAPIPermission( |
- base_name + '.' + permission_str, NULL, source, |
- api_permissions, error, unhandled_permissions)) |
+ if (!CreateAPIPermission(base_name + '.' + permission_str, |
+ nullptr, |
+ source, |
+ api_permissions, |
+ error, |
+ unhandled_permissions)) |
return false; |
} |
} |
- return CreateAPIPermission(base_name, NULL, source, |
- api_permissions, error, NULL); |
+ return CreateAPIPermission( |
+ base_name, nullptr, source, api_permissions, error, nullptr); |
} |
} // namespace |
@@ -139,9 +142,9 @@ bool APIPermissionSet::ParseFromJSON( |
std::vector<std::string>* unhandled_permissions) { |
for (size_t i = 0; i < permissions->GetSize(); ++i) { |
std::string permission_str; |
- const base::Value* permission_value = NULL; |
+ const base::Value* permission_value = nullptr; |
if (!permissions->GetString(i, &permission_str)) { |
- const base::DictionaryValue* dict = NULL; |
+ const base::DictionaryValue* dict = nullptr; |
// permission should be a string or a single key dict. |
if (!permissions->GetDictionary(i, &dict) || dict->size() != 1) { |
if (error) { |