| Index: extensions/common/manifest_test.cc
|
| diff --git a/extensions/common/manifest_test.cc b/extensions/common/manifest_test.cc
|
| index b1ab11551c0dc5e99593ae489918f1b96f2ec71d..9dbe3c2ac2b88c88b4b84049255ea97f1074c8b2 100644
|
| --- a/extensions/common/manifest_test.cc
|
| +++ b/extensions/common/manifest_test.cc
|
| @@ -27,8 +27,8 @@ base::DictionaryValue* LoadManifestFile(const base::FilePath& manifest_path,
|
| "Couldn't find " << manifest_path.value();
|
|
|
| JSONFileValueSerializer serializer(manifest_path);
|
| - base::DictionaryValue* manifest =
|
| - static_cast<base::DictionaryValue*>(serializer.Deserialize(NULL, error));
|
| + base::DictionaryValue* manifest = static_cast<base::DictionaryValue*>(
|
| + serializer.Deserialize(nullptr, error));
|
|
|
| // Most unit tests don't need localization, and they'll fail if we try to
|
| // localize them, since their manifests don't have a default_locale key.
|
| @@ -54,7 +54,7 @@ ManifestTest::~ManifestTest() {
|
| // Helper class that simplifies creating methods that take either a filename
|
| // to a manifest or the manifest itself.
|
| ManifestTest::ManifestData::ManifestData(const char* name)
|
| - : name_(name), manifest_(NULL) {
|
| + : name_(name), manifest_(nullptr) {
|
| }
|
|
|
| ManifestTest::ManifestData::ManifestData(base::DictionaryValue* manifest,
|
| @@ -107,7 +107,7 @@ scoped_refptr<Extension> ManifestTest::LoadExtension(
|
| base::FilePath test_data_dir = GetTestDataDir();
|
| base::DictionaryValue* value = manifest.GetManifest(test_data_dir, error);
|
| if (!value)
|
| - return NULL;
|
| + return nullptr;
|
| return Extension::Create(
|
| test_data_dir.DirName(), location, *value, flags, error);
|
| }
|
|
|