From 1524ef101cc4c0bcb047baf194479066552118af Mon Sep 17 00:00:00 2001 From: Christoph Kerschbaumer Date: Sun, 6 Dec 2015 20:59:19 -0800 Subject: [PATCH] Bug 1230220 - Convert JS callsites to use asyncOpen2 within modules/ (r=sicking) --- modules/libjar/test/unit/test_bug370103.js | 13 +-- modules/libjar/test/unit/test_bug407303.js | 19 +--- modules/libjar/test/unit/test_jarchannel.js | 115 +++++--------------- 3 files changed, 34 insertions(+), 113 deletions(-) diff --git a/modules/libjar/test/unit/test_bug370103.js b/modules/libjar/test/unit/test_bug370103.js index 5358c3e039e..210cf7a1531 100644 --- a/modules/libjar/test/unit/test_bug370103.js +++ b/modules/libjar/test/unit/test_bug370103.js @@ -1,7 +1,7 @@ var Cc = Components.classes; var Ci = Components.interfaces; var Cu = Components.utils; -Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/NetUtil.jsm"); // Regression test for bug 370103 - crash when passing a null listener to // nsIChannel.asyncOpen @@ -14,18 +14,11 @@ function run_test() { url = "jar:" + url + "!/test_bug370103"; // Try opening channel with null listener - var channel = ioService.newChannel2(url, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); + var channel = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true}); var exception = false; try { - channel.asyncOpen(null, null); + channel.asyncOpen2(null); } catch(e) { exception = true; diff --git a/modules/libjar/test/unit/test_bug407303.js b/modules/libjar/test/unit/test_bug407303.js index d137a3a65eb..313d88c6414 100644 --- a/modules/libjar/test/unit/test_bug407303.js +++ b/modules/libjar/test/unit/test_bug407303.js @@ -5,6 +5,7 @@ var Cc = Components.classes; var Ci = Components.interfaces; var Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/NetUtil.jsm"); // XXX: NS_ERROR_UNKNOWN_HOST is not in Components.results const NS_ERROR_UNKNOWN_HOST = 0x804B001E; @@ -32,18 +33,10 @@ var listener = { function run_test() { Services.prefs.setBoolPref("network.jar.block-remote-files", false); - - var ios = Cc["@mozilla.org/network/io-service;1"]. - getService(Ci.nsIIOService); - - var channel = ios.newChannel2("jar:http://test.invalid/test.jar!/index.html", - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); - channel.asyncOpen(listener, null); + var channel = NetUtil.newChannel({ + uri: "jar:http://test.invalid/test.jar!/index.html", + loadUsingSystemPrincipal: true} + ); + channel.asyncOpen2(listener); do_test_pending(); } diff --git a/modules/libjar/test/unit/test_jarchannel.js b/modules/libjar/test/unit/test_jarchannel.js index 49421b14c2b..eca6151d802 100644 --- a/modules/libjar/test/unit/test_jarchannel.js +++ b/modules/libjar/test/unit/test_jarchannel.js @@ -15,6 +15,7 @@ const {classes: Cc, } = Components; Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/NetUtil.jsm"); const ios = Cc["@mozilla.org/network/io-service;1"]. getService(Ci.nsIIOService); @@ -75,23 +76,16 @@ Listener.prototype = { */ function testAsync() { var uri = jarBase + "/inner40.zip"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}); do_check_true(chan.contentLength < 0); - chan.asyncOpen(new Listener(function(l) { + chan.asyncOpen2(new Listener(function(l) { do_check_true(chan.contentLength > 0); do_check_true(l.gotStartRequest); do_check_true(l.gotStopRequest); do_check_eq(l.available, chan.contentLength); run_next_test(); - }), null); + })); } add_test(testAsync); @@ -104,15 +98,8 @@ add_test(testAsync); */ function testZipEntry() { var uri = jarBase + "/inner40.zip"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER) - .QueryInterface(Ci.nsIJARChannel); + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}) + .QueryInterface(Ci.nsIJARChannel); var entry = chan.zipEntry; do_check_true(entry.CRC32 == 0x8b635486); do_check_true(entry.realSize == 184); @@ -132,15 +119,8 @@ if (!inChild) { */ add_test(function testSync() { var uri = jarBase + "/inner40.zip"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); - var stream = chan.open(); + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}); + var stream = chan.open2(); do_check_true(chan.contentLength > 0); do_check_eq(stream.available(), chan.contentLength); stream.close(); @@ -155,15 +135,8 @@ if (!inChild) { */ add_test(function testSyncNested() { var uri = "jar:" + jarBase + "/inner40.zip!/foo"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); - var stream = chan.open(); + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}); + var stream = chan.open2(); do_check_true(chan.contentLength > 0); do_check_eq(stream.available(), chan.contentLength); stream.close(); @@ -177,22 +150,15 @@ if (!inChild) { */ add_test(function testAsyncNested(next) { var uri = "jar:" + jarBase + "/inner40.zip!/foo"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); - chan.asyncOpen(new Listener(function(l) { + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}); + chan.asyncOpen2(new Listener(function(l) { do_check_true(chan.contentLength > 0); do_check_true(l.gotStartRequest); do_check_true(l.gotStopRequest); do_check_eq(l.available, chan.contentLength); run_next_test(); - }), null); + })); }); /** @@ -203,17 +169,9 @@ if (!inChild) { var copy = tmpDir.clone(); copy.append(fileBase); file.copyTo(copy.parent, copy.leafName); - var uri = "jar:" + ios.newFileURI(copy).spec + "!/inner40.zip"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); - var stream = chan.open(); + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}); + var stream = chan.open2(); do_check_true(chan.contentLength > 0); stream.close(); @@ -240,15 +198,9 @@ if (!inChild) { file.copyTo(copy.parent, copy.leafName); var uri = "jar:" + ios.newFileURI(copy).spec + "!/inner40.zip"; - var chan = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER); - chan.asyncOpen(new Listener(function (l) { + var chan = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}); + + chan.asyncOpen2(new Listener(function (l) { do_check_true(chan.contentLength > 0); // Drop any jar caches @@ -262,7 +214,7 @@ if (!inChild) { } run_next_test(); - }), null); + })); }); } // if !inChild @@ -281,32 +233,15 @@ if (inChild) { var num = 10; var chan = []; for (var i = 0; i < num; i++) { - chan[i] = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER) - .QueryInterface(Ci.nsIJARChannel); - chan[i].asyncOpen(new Listener(function(l) { - }), null); + chan[i] = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}) + .QueryInterface(Ci.nsIJARChannel); + chan[i].asyncOpen2(new Listener(function(l) {})); } // Open the last channel - var chan_last = ios.newChannel2(uri, - null, - null, - null, // aLoadingNode - Services.scriptSecurityManager.getSystemPrincipal(), - null, // aTriggeringPrincipal - Ci.nsILoadInfo.SEC_NORMAL, - Ci.nsIContentPolicy.TYPE_OTHER) - .QueryInterface(Ci.nsIJARChannel); - chan_last.asyncOpen(new Listener(function(l) { - run_next_test(); - }), null); + var chan_last = NetUtil.newChannel({uri: uri, loadUsingSystemPrincipal: true}) + .QueryInterface(Ci.nsIJARChannel); + chan_last.asyncOpen2(new Listener(function(l) { run_next_test(); })); }); } // if inChild