Bug 1349903 - Remove the code section of getting originAttributes from loadInfo in HttpChannelParent::DoAsyncOpen() and add a null check for loadInfo. r?mayhemer
The code section of getting originAttributes from loadInfo in HttpChannelParent
::DoAsyncOpen() is no longer needed since AppId is gone and the originAttributes
here is for AppId.
And we also need a null check for loadInfo that every channel should have a
loadInfo.
MozReview-Commit-ID: CQe8wlEo0GP
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -356,20 +356,18 @@ HttpChannelParent::DoAsyncOpen( const U
nsCOMPtr<nsILoadInfo> loadInfo;
rv = mozilla::ipc::LoadInfoArgsToLoadInfo(aLoadInfoArgs,
getter_AddRefs(loadInfo));
if (NS_FAILED(rv)) {
return SendFailedAsyncOpen(rv);
}
- OriginAttributes attrs;
- rv = loadInfo->GetOriginAttributes(&attrs);
- if (NS_FAILED(rv)) {
- return SendFailedAsyncOpen(rv);
+ if (!loadInfo) {
+ return SendFailedAsyncOpen(NS_ERROR_UNEXPECTED);
}
nsCOMPtr<nsIChannel> channel;
rv = NS_NewChannelInternal(getter_AddRefs(channel), uri, loadInfo,
nullptr, nullptr, aLoadFlags, ios);
if (NS_FAILED(rv)) {
return SendFailedAsyncOpen(rv);
}