Bug 1119005 - No need to branch on NewChannelinternal callsites anymore - netUtil.h changes (r=sicking,sworkman)

This commit is contained in:
Christoph Kerschbaumer 2015-02-19 11:47:18 -08:00
parent 0d2e8077c3
commit 04c1112977

View File

@ -596,7 +596,6 @@ NS_NewInputStreamChannelInternal(nsIChannel** outChannel,
const nsACString& aContentCharset,
nsILoadInfo* aLoadInfo)
{
MOZ_ASSERT(aLoadInfo, "can not create channel without a loadinfo");
nsresult rv;
nsCOMPtr<nsIInputStreamChannel> isc =
do_CreateInstance(NS_INPUTSTREAMCHANNEL_CONTRACTID, &rv);
@ -623,7 +622,7 @@ NS_NewInputStreamChannelInternal(nsIChannel** outChannel,
// If we're sandboxed, make sure to clear any owner the channel
// might already have.
if (aLoadInfo->GetLoadingSandboxed()) {
if (aLoadInfo && aLoadInfo->GetLoadingSandboxed()) {
channel->SetOwner(nullptr);
}