| Index: extensions/common/manifest_handlers/nacl_modules_handler.cc
|
| diff --git a/extensions/common/manifest_handlers/nacl_modules_handler.cc b/extensions/common/manifest_handlers/nacl_modules_handler.cc
|
| index 6715b2e4133ac2e85d333602cc03729b38026ccc..61125d640ba934473a383fcc554bdd2c66660820 100644
|
| --- a/extensions/common/manifest_handlers/nacl_modules_handler.cc
|
| +++ b/extensions/common/manifest_handlers/nacl_modules_handler.cc
|
| @@ -31,7 +31,7 @@ const NaClModuleInfo::List* NaClModuleInfo::GetNaClModules(
|
| const Extension* extension) {
|
| NaClModuleData* data = static_cast<NaClModuleData*>(
|
| extension->GetManifestData(keys::kNaClModules));
|
| - return data ? &data->nacl_modules_ : NULL;
|
| + return data ? &data->nacl_modules_ : nullptr;
|
| }
|
|
|
| NaClModulesHandler::NaClModulesHandler() {
|
| @@ -41,7 +41,7 @@ NaClModulesHandler::~NaClModulesHandler() {
|
| }
|
|
|
| bool NaClModulesHandler::Parse(Extension* extension, base::string16* error) {
|
| - const base::ListValue* list_value = NULL;
|
| + const base::ListValue* list_value = nullptr;
|
| if (!extension->manifest()->GetList(keys::kNaClModules, &list_value)) {
|
| *error = base::ASCIIToUTF16(errors::kInvalidNaClModules);
|
| return false;
|
| @@ -50,7 +50,7 @@ bool NaClModulesHandler::Parse(Extension* extension, base::string16* error) {
|
| scoped_ptr<NaClModuleData> nacl_module_data(new NaClModuleData);
|
|
|
| for (size_t i = 0; i < list_value->GetSize(); ++i) {
|
| - const base::DictionaryValue* module_value = NULL;
|
| + const base::DictionaryValue* module_value = nullptr;
|
| if (!list_value->GetDictionary(i, &module_value)) {
|
| *error = base::ASCIIToUTF16(errors::kInvalidNaClModules);
|
| return false;
|
|
|