| Index: extensions/common/permissions/api_permission.cc
|
| diff --git a/extensions/common/permissions/api_permission.cc b/extensions/common/permissions/api_permission.cc
|
| index de0dd98970e2c43b4a917af90f55f1561a1ce0ef..8423ed825223364c27c9cca5032d3a38d44a192b 100644
|
| --- a/extensions/common/permissions/api_permission.cc
|
| +++ b/extensions/common/permissions/api_permission.cc
|
| @@ -51,7 +51,7 @@ class SimpleAPIPermission : public APIPermission {
|
| const base::Value* value,
|
| std::string* /*error*/,
|
| std::vector<std::string>* /*unhandled_permissions*/) OVERRIDE {
|
| - return (value == NULL);
|
| + return (value == nullptr);
|
| }
|
|
|
| virtual scoped_ptr<base::Value> ToValue() const OVERRIDE {
|
| @@ -64,7 +64,7 @@ class SimpleAPIPermission : public APIPermission {
|
|
|
| virtual APIPermission* Diff(const APIPermission* rhs) const OVERRIDE {
|
| CHECK_EQ(info(), rhs->info());
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| virtual APIPermission* Union(const APIPermission* rhs) const OVERRIDE {
|
|
|