corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1407679 - Merge nsIIOService and nsIIOService2 r=nwgh

Browse Source 
Removes deprecated nsIIOService2.newChannelFromURIWithProxyFlags

MozReview-Commit-ID: Gr3nA25kcre
This commit is contained in:
Valentin Gosu
2017-10-20 16:41:07 +02:00
parent 7d49a28179
commit eb16c9049c
20 changed files with 64 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -25,7 +25,7 @@
#include "nsIDNSRecord.h"
#include "nsIDNSService.h"
#include "nsIStreamConverterService.h"
#include "nsIIOService2.h"
#include "nsIIOService.h"
#include "nsIProtocolProxyService.h"
#include "nsIProxyInfo.h"
#include "nsIProxiedChannel.h"
@@ -3475,15 +3475,9 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
return rv;
}
nsCOMPtr<nsIIOService2> io2 = do_QueryInterface(ioService, &rv);
if (NS_FAILED(rv)) {
NS_WARNING("WebSocketChannel: unable to continue without ioservice2");
return rv;
}
// Ideally we'd call newChannelFromURIWithLoadInfo here, but that doesn't
// allow setting proxy uri/flags
rv = io2->NewChannelFromURIWithProxyFlags2(
rv = ioService->NewChannelFromURIWithProxyFlags2(
localURI,
mURI,
nsIProtocolProxyService::RESOLVE_PREFER_HTTPS_PROXY |