Index: chrome/browser/extensions/component_loader.cc |
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc |
index a63c7285d409e6094cee9fd30a48f8bb53d3431f..6fa3469728d2d32a26f74471fbcde1a2a5cadcf5 100644 |
--- a/chrome/browser/extensions/component_loader.cc |
+++ b/chrome/browser/extensions/component_loader.cc |
@@ -167,7 +167,7 @@ std::string ComponentLoader::AddOrReplace(const base::FilePath& path) { |
if (!manifest) { |
LOG(ERROR) << "Could not load extension from '" << |
absolute_path.value() << "'. " << error; |
- return NULL; |
+ return std::string(); |
achuithb
2013/05/23 22:34:47
let's split this file out of this CL.
|
} |
Remove(GenerateId(manifest.get(), absolute_path)); |