| Index: extensions/common/permissions/permissions_data.cc
|
| diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
|
| index af405273e3a698f644adf8ee081b235f57ed0ffb..2474c4a477c3b0e2671c6283b5b464a7e89f76a5 100644
|
| --- a/extensions/common/permissions/permissions_data.cc
|
| +++ b/extensions/common/permissions/permissions_data.cc
|
| @@ -23,7 +23,7 @@ namespace extensions {
|
|
|
| namespace {
|
|
|
| -PermissionsData::PolicyDelegate* g_policy_delegate = NULL;
|
| +PermissionsData::PolicyDelegate* g_policy_delegate = nullptr;
|
|
|
| } // namespace
|
|
|
| @@ -315,7 +315,7 @@ scoped_refptr<const PermissionSet> PermissionsData::GetTabSpecificPermissions(
|
| CHECK_GE(tab_id, 0);
|
| TabPermissionsMap::const_iterator iter =
|
| tab_specific_permissions_.find(tab_id);
|
| - return (iter != tab_specific_permissions_.end()) ? iter->second : NULL;
|
| + return (iter != tab_specific_permissions_.end()) ? iter->second : nullptr;
|
| }
|
|
|
| bool PermissionsData::HasTabSpecificPermissionToExecuteScript(
|
|
|