summaryrefslogtreecommitdiffstats
path: root/netwerk/test/unit/test_cache_jar.js
diff options
context:
space:
mode:
Diffstat (limited to 'netwerk/test/unit/test_cache_jar.js')
-rw-r--r--netwerk/test/unit/test_cache_jar.js25
1 files changed, 11 insertions, 14 deletions
diff --git a/netwerk/test/unit/test_cache_jar.js b/netwerk/test/unit/test_cache_jar.js
index bedde668b4..1ab93980a6 100644
--- a/netwerk/test/unit/test_cache_jar.js
+++ b/netwerk/test/unit/test_cache_jar.js
@@ -20,27 +20,24 @@ function cached_handler(metadata, response) {
handlers_called++;
}
-function makeChan(url, inIsolatedMozBrowser, userContextId) {
+function makeChan(url, userContextId) {
var chan = NetUtil.newChannel({
uri: url,
loadUsingSystemPrincipal: true,
}).QueryInterface(Ci.nsIHttpChannel);
- chan.loadInfo.originAttributes = { inIsolatedMozBrowser, userContextId };
+ chan.loadInfo.originAttributes = { userContextId };
return chan;
}
-// [inIsolatedMozBrowser, userContextId, expected_handlers_called]
+// [userContextId, expected_handlers_called]
var firstTests = [
- [false, 0, 1],
- [true, 0, 1],
- [false, 1, 1],
- [true, 1, 1],
+ [0, 1],
+ [1, 1],
];
var secondTests = [
- [false, 0, 0],
- [true, 0, 0],
- [false, 1, 1],
- [true, 1, 0],
+ [0, 0],
+ [1, 1],
+ [1, 0],
];
async function run_all_tests() {
@@ -81,9 +78,9 @@ function run_test() {
});
}
-function test_channel(inIsolatedMozBrowser, userContextId, expected) {
+function test_channel(userContextId, expected) {
return new Promise(resolve => {
- var chan = makeChan(URL, inIsolatedMozBrowser, userContextId);
+ var chan = makeChan(URL, userContextId);
chan.asyncOpen(
new ChannelListener(doneFirstLoad.bind(null, resolve), expected)
);
@@ -93,7 +90,7 @@ function test_channel(inIsolatedMozBrowser, userContextId, expected) {
function doneFirstLoad(resolve, req, buffer, expected) {
// Load it again, make sure it hits the cache
var oa = req.loadInfo.originAttributes;
- var chan = makeChan(URL, oa.isInIsolatedMozBrowserElement, oa.userContextId);
+ var chan = makeChan(URL, oa.userContextId);
chan.asyncOpen(
new ChannelListener(doneSecondLoad.bind(null, resolve), expected)
);