service worker: Replace XHR tests with a test in interfaces-sw.https.html
This removes Chromium's xhr-is-not-exposed.html and WPT's xhr.https.html,
replacing them with a simple test in interfaces-sw.https.html.
xhr-is-not-exposed.html was from https://crbug.com/395931
xhr.https.html was from https://bugzilla.mozilla.org/show_bug.cgi?id=931243
Bug: 395931, 688116
Change-Id: I5315bd9e6c0f0fc117ab7924da908a002dda5203
Reviewed-on: https://chromium-review.googlesource.com/755882
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#514321}
diff --git a/service-workers/service-worker/resources/interfaces-worker.sub.js b/service-workers/service-worker/resources/interfaces-worker.sub.js
index ef333cb..89cf503 100644
--- a/service-workers/service-worker/resources/interfaces-worker.sub.js
+++ b/service-workers/service-worker/resources/interfaces-worker.sub.js
@@ -73,3 +73,7 @@
'http://{{host}}/',
'FetchEvent.request.url should return the value it was initialized to');
}, 'Event constructors');
+
+test(() => {
+ assert_false('XMLHttpRequest' in self);
+ }, 'xhr is not exposed');
diff --git a/service-workers/service-worker/resources/xhr.js b/service-workers/service-worker/resources/xhr.js
deleted file mode 100644
index 387c4a4..0000000
--- a/service-workers/service-worker/resources/xhr.js
+++ /dev/null
@@ -1,6 +0,0 @@
-self.addEventListener('activate', function(event) {
- event.waitUntil(clients.claim());
- });
-self.addEventListener('message', function(event) {
- event.data.port.postMessage({xhr: !!("XMLHttpRequest" in self)});
- });
diff --git a/service-workers/service-worker/xhr.https.html b/service-workers/service-worker/xhr.https.html
deleted file mode 100644
index 0805cf8..0000000
--- a/service-workers/service-worker/xhr.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>Service Worker: XHR doesn't exist</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="resources/test-helpers.sub.js?pipe=sub"></script>
-<script>
-
-async_test(function(t) {
- var path = new URL(".", window.location).pathname
- var url = 'resources/xhr.js';
- var scope = 'resources/blank.html?xhr';
- var host_info = get_host_info();
- var frameURL = host_info['HTTPS_ORIGIN'] + path + scope;
-
- service_worker_unregister_and_register(t, url, scope)
- .then(function(registration) {
- return wait_for_state(t, registration.installing, 'activated');
- })
- .then(function() { return with_iframe(frameURL); })
- .then(function(frame) {
- return new Promise(function(resolve, reject) {
- function onMessage(e) {
- assert_false(e.data.xhr);
- frame.remove();
- service_worker_unregister_and_done(t, scope);
- }
- var channel = new MessageChannel();
- channel.port1.onmessage = t.step_func(onMessage);
- frame.contentWindow.navigator.serviceWorker.controller.postMessage({port: channel.port2}, [channel.port2]);
- })
- })
- .catch(unreached_rejection(t));
- }, 'Verify XHR does not exist');
-</script>
