diff --git a/dom/workers/test/serviceworkers/fetch/context/index.html b/dom/workers/test/serviceworkers/fetch/context/index.html
index 4cc1bec06583..218ead144bc7 100644
--- a/dom/workers/test/serviceworkers/fetch/context/index.html
+++ b/dom/workers/test/serviceworkers/fetch/context/index.html
@@ -413,37 +413,8 @@
});
}
- Promise.all([
- testFetch(),
- testImage(),
- testImageSrcSet(),
- testPicture(),
- testAudio(),
- testVideo(),
- testBeacon(),
- testCSPReport(),
- testEmbed(),
- testObject(),
- testFont(),
- testIFrame(),
- testFrame(),
- testInternal(),
- testPing(),
- testPlugin(),
- testScript(),
- testStyle(),
- testTrack(),
- testXHR(),
- testXSLT(),
- testWorker(),
- testNestedWorker(),
- testSharedWorker(),
- testNestedWorkerInSharedWorker(),
-
- // Also, test to see if the type of the request can be persisted in the database.
- testCache(),
- ])
- .then(function() {
+ var testName = location.search.substr(1);
+ window[testName]().then(function() {
finish();
}, function(e) {
ok(false, "A promise was rejected: " + e);
diff --git a/dom/workers/test/serviceworkers/mochitest.ini b/dom/workers/test/serviceworkers/mochitest.ini
index 5cb01678346d..66877b573f41 100644
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -189,8 +189,32 @@ skip-if = !debug
[test_post_message_source.html]
[test_register_base.html]
[test_register_https_in_http.html]
-[test_request_context.html]
-skip-if = toolkit == 'android' # Bug 1163410
+[test_request_context_audio.html]
+[test_request_context_beacon.html]
+[test_request_context_cache.html]
+[test_request_context_cspreport.html]
+[test_request_context_embed.html]
+[test_request_context_fetch.html]
+[test_request_context_font.html]
+[test_request_context_frame.html]
+[test_request_context_iframe.html]
+[test_request_context_image.html]
+[test_request_context_imagesrcset.html]
+[test_request_context_internal.html]
+[test_request_context_nestedworker.html]
+[test_request_context_nestedworkerinsharedworker.html]
+[test_request_context_object.html]
+[test_request_context_picture.html]
+[test_request_context_ping.html]
+[test_request_context_plugin.html]
+[test_request_context_script.html]
+[test_request_context_sharedworker.html]
+[test_request_context_style.html]
+[test_request_context_track.html]
+[test_request_context_video.html]
+[test_request_context_worker.html]
+[test_request_context_xhr.html]
+[test_request_context_xslt.html]
[test_scopes.html]
[test_sandbox_intercept.html]
[test_sanitize.html]
diff --git a/dom/workers/test/serviceworkers/test_request_context.js b/dom/workers/test/serviceworkers/test_request_context.js
index 322990b27793..19bce753599b 100644
--- a/dom/workers/test/serviceworkers/test_request_context.js
+++ b/dom/workers/test/serviceworkers/test_request_context.js
@@ -48,7 +48,7 @@ function runTest() {
} else if (e.data.status == "todo") {
todo(e.data.result, e.data.message);
} else if (e.data.status == "registrationdone") {
- iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/context/index.html";
+ iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/context/index.html?" + gTest;
} else if (e.data.status == "done") {
iframe.src = "/tests/dom/workers/test/serviceworkers/fetch/context/unregister.html";
} else if (e.data.status == "unregistrationdone") {
diff --git a/dom/workers/test/serviceworkers/test_request_context_audio.html b/dom/workers/test/serviceworkers/test_request_context_audio.html
new file mode 100644
index 000000000000..929a244281aa
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_audio.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_beacon.html b/dom/workers/test/serviceworkers/test_request_context_beacon.html
new file mode 100644
index 000000000000..ce44214d60ff
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_beacon.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_cache.html b/dom/workers/test/serviceworkers/test_request_context_cache.html
new file mode 100644
index 000000000000..3d62baabc125
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_cache.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_cspreport.html b/dom/workers/test/serviceworkers/test_request_context_cspreport.html
new file mode 100644
index 000000000000..a27e7930374c
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_cspreport.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_embed.html b/dom/workers/test/serviceworkers/test_request_context_embed.html
new file mode 100644
index 000000000000..f8d37424621d
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_embed.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_fetch.html b/dom/workers/test/serviceworkers/test_request_context_fetch.html
new file mode 100644
index 000000000000..94de8be3115f
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_fetch.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_font.html b/dom/workers/test/serviceworkers/test_request_context_font.html
new file mode 100644
index 000000000000..d81a0686b7c1
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_font.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_frame.html b/dom/workers/test/serviceworkers/test_request_context_frame.html
new file mode 100644
index 000000000000..d5dc1f745211
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_frame.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_iframe.html b/dom/workers/test/serviceworkers/test_request_context_iframe.html
new file mode 100644
index 000000000000..d3b0675e0e88
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_iframe.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_image.html b/dom/workers/test/serviceworkers/test_request_context_image.html
new file mode 100644
index 000000000000..810063da4d7f
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_image.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_imagesrcset.html b/dom/workers/test/serviceworkers/test_request_context_imagesrcset.html
new file mode 100644
index 000000000000..95b2b7214fc0
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_imagesrcset.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_internal.html b/dom/workers/test/serviceworkers/test_request_context_internal.html
new file mode 100644
index 000000000000..45f454495b07
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_internal.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_nestedworker.html b/dom/workers/test/serviceworkers/test_request_context_nestedworker.html
new file mode 100644
index 000000000000..226de691bb04
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_nestedworker.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_nestedworkerinsharedworker.html b/dom/workers/test/serviceworkers/test_request_context_nestedworkerinsharedworker.html
new file mode 100644
index 000000000000..48934a57c2a0
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_nestedworkerinsharedworker.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_object.html b/dom/workers/test/serviceworkers/test_request_context_object.html
new file mode 100644
index 000000000000..189c5adbb94b
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_object.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_picture.html b/dom/workers/test/serviceworkers/test_request_context_picture.html
new file mode 100644
index 000000000000..1b49e7eb93cf
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_picture.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_ping.html b/dom/workers/test/serviceworkers/test_request_context_ping.html
new file mode 100644
index 000000000000..460e9efb43b4
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_ping.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_plugin.html b/dom/workers/test/serviceworkers/test_request_context_plugin.html
new file mode 100644
index 000000000000..862e9d4a5590
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_plugin.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_script.html b/dom/workers/test/serviceworkers/test_request_context_script.html
new file mode 100644
index 000000000000..ec560ef7246a
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_script.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_sharedworker.html b/dom/workers/test/serviceworkers/test_request_context_sharedworker.html
new file mode 100644
index 000000000000..93ccdf3ae64b
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_sharedworker.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_style.html b/dom/workers/test/serviceworkers/test_request_context_style.html
new file mode 100644
index 000000000000..b557d5c047dd
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_style.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_track.html b/dom/workers/test/serviceworkers/test_request_context_track.html
new file mode 100644
index 000000000000..1b161c4d0678
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_track.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_video.html b/dom/workers/test/serviceworkers/test_request_context_video.html
new file mode 100644
index 000000000000..1886e31d73df
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_video.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context_worker.html b/dom/workers/test/serviceworkers/test_request_context_worker.html
new file mode 100644
index 000000000000..9de12730457e
--- /dev/null
+++ b/dom/workers/test/serviceworkers/test_request_context_worker.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Bug 1121157 - Test that Request objects passed to FetchEvent have the correct context
+
+
+
+
+
+
+
+
+
diff --git a/dom/workers/test/serviceworkers/test_request_context.html b/dom/workers/test/serviceworkers/test_request_context_xhr.html
similarity index 89%
rename from dom/workers/test/serviceworkers/test_request_context.html
rename to dom/workers/test/serviceworkers/test_request_context_xhr.html
index 9bd5afe14b27..ed0d60bf87e5 100644
--- a/dom/workers/test/serviceworkers/test_request_context.html
+++ b/dom/workers/test/serviceworkers/test_request_context_xhr.html
@@ -12,5 +12,8 @@
+