Bug 1223437 - Use channel.asyncOpen2 in toolkit/components/jsdownloads/test/unit (r=sicking)

This commit is contained in:
Christoph Kerschbaumer 2015-11-15 14:48:38 -08:00
parent bfa00b54c4
commit 4ab9e210d3
2 changed files with 6 additions and 4 deletions

View File

@ -410,10 +410,11 @@ function promiseStartExternalHelperAppServiceDownload(aSourceUrl) {
let channel = NetUtil.newChannel({
uri: sourceURI,
loadUsingSystemPrincipal: true,
securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL
});
// Start the actual download process.
channel.asyncOpen({
channel.asyncOpen2({
contentListener: null,
onStartRequest: function (aRequest, aContext)
@ -435,7 +436,7 @@ function promiseStartExternalHelperAppServiceDownload(aSourceUrl) {
this.contentListener.onDataAvailable(aRequest, aContext, aInputStream,
aOffset, aCount);
},
}, null);
});
}.bind(this)).then(null, do_report_unexpected_exception);
return deferred.promise;

View File

@ -167,9 +167,10 @@ function promiseEntityID(aUrl) {
let channel = NetUtil.newChannel({
uri: NetUtil.newURI(aUrl),
loadUsingSystemPrincipal: true,
securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL
});
channel.asyncOpen({
channel.asyncOpen2({
onStartRequest: function (aRequest) {
if (aRequest instanceof Ci.nsIResumableChannel) {
entityID = aRequest.entityID;
@ -186,7 +187,7 @@ function promiseEntityID(aUrl) {
},
onDataAvailable: function () {}
}, null);
});
return deferred.promise;
}