Bug 1079451: Don't log unnecessary warnings from chrome registration. r=bsmedberg
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -761,28 +761,26 @@ ParseManifest(NSLocationType aType, File
LogMessageWithContext(aFile, line,
"Chrome registry isn't available yet.");
continue;
}
}
(nsChromeRegistry::gChromeRegistry->*(directive->regfunc))(
chromecx, line, argv, platform, contentAccessible);
- } else if (directive->mgrfunc && (directive->ischrome || !aChromeOnly)) {
+ } else if (directive->ischrome || !aChromeOnly) {
if (directive->isContract) {
CachedDirective* cd = contracts.AppendElement();
cd->lineno = line;
cd->argv[0] = argv[0];
cd->argv[1] = argv[1];
} else {
(nsComponentManagerImpl::gComponentManager->*(directive->mgrfunc))(
mgrcx, line, argv);
}
- } else {
- LogMessageWithContext(aFile, line, "No valid manifest directive.");
}
}
for (uint32_t i = 0; i < contracts.Length(); ++i) {
CachedDirective& d = contracts[i];
nsComponentManagerImpl::gComponentManager->ManifestContract(mgrcx,
d.lineno,
d.argv);