Index: extensions/common/file_util.cc |
diff --git a/extensions/common/file_util.cc b/extensions/common/file_util.cc |
index e0ce3399c0b5b7aa263c0aa16f4e26ed25842454..e81cdbfc0bb88b0c027893b4c13c6febb4228b7c 100644 |
--- a/extensions/common/file_util.cc |
+++ b/extensions/common/file_util.cc |
@@ -134,20 +134,20 @@ scoped_refptr<Extension> LoadExtension(const base::FilePath& extension_path, |
scoped_ptr<base::DictionaryValue> manifest( |
LoadManifest(extension_path, error)); |
if (!manifest.get()) |
- return NULL; |
+ return nullptr; |
if (!extension_l10n_util::LocalizeExtension( |
extension_path, manifest.get(), error)) { |
- return NULL; |
+ return nullptr; |
} |
scoped_refptr<Extension> extension(Extension::Create( |
extension_path, location, *manifest, flags, extension_id, error)); |
if (!extension.get()) |
- return NULL; |
+ return nullptr; |
std::vector<InstallWarning> warnings; |
if (!ValidateExtension(extension.get(), error, &warnings)) |
- return NULL; |
+ return nullptr; |
extension->AddInstallWarnings(warnings); |
return extension; |
@@ -165,11 +165,11 @@ base::DictionaryValue* LoadManifest( |
base::FilePath manifest_path = extension_path.Append(manifest_filename); |
if (!base::PathExists(manifest_path)) { |
*error = l10n_util::GetStringUTF8(IDS_EXTENSION_MANIFEST_UNREADABLE); |
- return NULL; |
+ return nullptr; |
} |
JSONFileValueSerializer serializer(manifest_path); |
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, error)); |
+ scoped_ptr<base::Value> root(serializer.Deserialize(nullptr, error)); |
if (!root.get()) { |
if (error->empty()) { |
// If |error| is empty, than the file could not be read. |
@@ -181,12 +181,12 @@ base::DictionaryValue* LoadManifest( |
*error = base::StringPrintf( |
"%s %s", manifest_errors::kManifestParseError, error->c_str()); |
} |
- return NULL; |
+ return nullptr; |
} |
if (!root->IsType(base::Value::TYPE_DICTIONARY)) { |
*error = l10n_util::GetStringUTF8(IDS_EXTENSION_MANIFEST_INVALID); |
- return NULL; |
+ return nullptr; |
} |
return static_cast<base::DictionaryValue*>(root.release()); |
@@ -397,16 +397,16 @@ MessageBundle* LoadMessageBundle( |
// Load locale information if available. |
base::FilePath locale_path = extension_path.Append(kLocaleFolder); |
if (!base::PathExists(locale_path)) |
- return NULL; |
+ return nullptr; |
std::set<std::string> locales; |
if (!extension_l10n_util::GetValidLocales(locale_path, &locales, error)) |
- return NULL; |
+ return nullptr; |
if (default_locale.empty() || locales.find(default_locale) == locales.end()) { |
*error = l10n_util::GetStringUTF8( |
IDS_EXTENSION_LOCALES_NO_DEFAULT_LOCALE_SPECIFIED); |
- return NULL; |
+ return nullptr; |
} |
MessageBundle* message_bundle = |