diff --git a/dom/jsurl/nsJSProtocolHandler.cpp b/dom/jsurl/nsJSProtocolHandler.cpp index 6f5b3688e2e..e024f4c5331 100644 --- a/dom/jsurl/nsJSProtocolHandler.cpp +++ b/dom/jsurl/nsJSProtocolHandler.cpp @@ -565,15 +565,6 @@ nsJSChannel::Open2(nsIInputStream** aStream) NS_IMETHODIMP nsJSChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { -#ifdef DEBUG - { - nsCOMPtr loadInfo = nsIChannel::GetLoadInfo(); - MOZ_ASSERT(!loadInfo || loadInfo->GetSecurityMode() == 0 || - loadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - } -#endif - NS_ENSURE_ARG(aListener); // First make sure that we have a usable inner window; we'll want to make diff --git a/image/decoders/icon/mac/nsIconChannelCocoa.mm b/image/decoders/icon/mac/nsIconChannelCocoa.mm index c65effe7eb2..77e0c31bb02 100644 --- a/image/decoders/icon/mac/nsIconChannelCocoa.mm +++ b/image/decoders/icon/mac/nsIconChannelCocoa.mm @@ -225,10 +225,6 @@ NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener* aListener, nsISupports* ctxt) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - nsCOMPtr inStream; nsresult rv = MakeInputStream(getter_AddRefs(inStream), true); NS_ENSURE_SUCCESS(rv, rv); diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp index 367d46beae4..f180aa73b4e 100644 --- a/image/decoders/icon/win/nsIconChannel.cpp +++ b/image/decoders/icon/win/nsIconChannel.cpp @@ -239,10 +239,6 @@ NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener* aListener, nsISupports* ctxt) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - nsCOMPtr inStream; nsresult rv = MakeInputStream(getter_AddRefs(inStream), true); if (NS_FAILED(rv)) { diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index 3a027ca3a6d..eeffff82eb6 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -933,10 +933,6 @@ nsJARChannel::OverrideWithSynthesizedResponse(nsIInputStream* aSynthesizedInput, NS_IMETHODIMP nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetEnforceSecurity(), - "security flags in loadInfo but asyncOpen2() not called"); - LOG(("nsJARChannel::AsyncOpen [this=%x]\n", this)); NS_ENSURE_ARG_POINTER(listener); diff --git a/netwerk/base/nsBaseChannel.cpp b/netwerk/base/nsBaseChannel.cpp index 8568b5f968a..cde055f4be0 100644 --- a/netwerk/base/nsBaseChannel.cpp +++ b/netwerk/base/nsBaseChannel.cpp @@ -626,10 +626,6 @@ nsBaseChannel::Open2(nsIInputStream** aStream) NS_IMETHODIMP nsBaseChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - NS_ENSURE_TRUE(mURI, NS_ERROR_NOT_INITIALIZED); NS_ENSURE_TRUE(!mPump, NS_ERROR_IN_PROGRESS); NS_ENSURE_TRUE(!mWasOpened, NS_ERROR_ALREADY_OPENED); diff --git a/netwerk/protocol/app/AppProtocolHandler.cpp b/netwerk/protocol/app/AppProtocolHandler.cpp index 48f892b1a0e..94b41ae5d86 100644 --- a/netwerk/protocol/app/AppProtocolHandler.cpp +++ b/netwerk/protocol/app/AppProtocolHandler.cpp @@ -111,10 +111,6 @@ DummyChannel::Open2(nsIInputStream** aStream) NS_IMETHODIMP DummyChannel::AsyncOpen(nsIStreamListener* aListener, nsISupports* aContext) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - mListener = aListener; mListenerContext = aContext; mPending = true; diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index 17a23965014..4ab6c4a42da 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -1488,10 +1488,6 @@ HttpChannelChild::GetSecurityInfo(nsISupports **aSecurityInfo) NS_IMETHODIMP HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - LOG(("HttpChannelChild::AsyncOpen [this=%p uri=%s]\n", this, mSpec.get())); if (mCanceled) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 0f011e49c64..79ceb97d9c8 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -4953,10 +4953,6 @@ nsHttpChannel::GetSecurityInfo(nsISupports **securityInfo) NS_IMETHODIMP nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - LOG(("nsHttpChannel::AsyncOpen [this=%p]\n", this)); NS_ENSURE_ARG_POINTER(listener); diff --git a/netwerk/protocol/rtsp/RtspChannelChild.cpp b/netwerk/protocol/rtsp/RtspChannelChild.cpp index f6c8f7904ef..08e7d58975c 100644 --- a/netwerk/protocol/rtsp/RtspChannelChild.cpp +++ b/netwerk/protocol/rtsp/RtspChannelChild.cpp @@ -107,10 +107,6 @@ private: NS_IMETHODIMP RtspChannelChild::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - // Precondition checks. MOZ_ASSERT(aListener); nsCOMPtr uri = nsBaseChannel::URI(); diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 8824e9b1215..1edb63c54e2 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -258,15 +258,6 @@ nsViewSourceChannel::Open2(nsIInputStream** aStream) NS_IMETHODIMP nsViewSourceChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt) { -#ifdef DEBUG - { - nsCOMPtr loadInfo = mChannel->GetLoadInfo(); - MOZ_ASSERT(!loadInfo || loadInfo->GetSecurityMode() == 0 || - loadInfo->GetEnforceSecurity(), - "security flags in loadInfo but asyncOpen2() not called"); - } -#endif - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); mListener = aListener; diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp index ca16a2779fa..f041c11dbcd 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp +++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp @@ -626,10 +626,6 @@ GetTabChild(nsIChannel* aChannel) NS_IMETHODIMP WyciwygChannelChild::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - LOG(("WyciwygChannelChild::AsyncOpen [this=%p]\n", this)); // The only places creating wyciwyg: channels should be diff --git a/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp b/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp index 51d838d870f..0e27a1397e6 100644 --- a/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp +++ b/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp @@ -431,10 +431,6 @@ nsWyciwygChannel::Open2(nsIInputStream** aStream) NS_IMETHODIMP nsWyciwygChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - LOG(("nsWyciwygChannel::AsyncOpen [this=%p]\n", this)); MOZ_ASSERT(mMode == NONE, "nsWyciwygChannel already open"); diff --git a/uriloader/exthandler/nsExternalProtocolHandler.cpp b/uriloader/exthandler/nsExternalProtocolHandler.cpp index 0143c176e89..08ef7bf47a8 100644 --- a/uriloader/exthandler/nsExternalProtocolHandler.cpp +++ b/uriloader/exthandler/nsExternalProtocolHandler.cpp @@ -186,10 +186,6 @@ NS_IMETHODIMP nsExtProtocolChannel::Open2(nsIInputStream** aStream) NS_IMETHODIMP nsExtProtocolChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt) { - MOZ_ASSERT(!mLoadInfo || mLoadInfo->GetSecurityMode() == 0 || - mLoadInfo->GetInitialSecurityCheckDone(), - "security flags in loadInfo but asyncOpen2() not called"); - NS_ENSURE_ARG_POINTER(listener); NS_ENSURE_TRUE(!mWasOpened, NS_ERROR_ALREADY_OPENED);