Index: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/fetch-csp.https.html |
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/fetch-csp.https.html |
similarity index 57% |
copy from third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html |
copy to third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/fetch-csp.https.html |
index ee22c7fab5a5682a2087b429adf2c9e141275400..bdb56c213af6a16b7d053bb2c112737052638a16 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-cors-xhr.html |
+++ b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/fetch-csp.https.html |
@@ -1,20 +1,15 @@ |
<!DOCTYPE html> |
-<title>Service Worker: CORS XHR of fetch()</title> |
-<script src="../resources/testharness.js"></script> |
-<script src="../resources/testharnessreport.js"></script> |
-<script src="../resources/get-host-info.js?pipe=sub"></script> |
-<script src="resources/test-helpers.js"></script> |
-<body> |
+<title>Service Worker: CSP control of fetch()</title> |
+<script src="/resources/testharness.js"></script> |
+<script src="/resources/testharnessreport.js"></script> |
+<script src="resources/get-host-info.sub.js"></script> |
+<script src="resources/test-helpers.sub.js?pipe=sub"></script> |
<script> |
async_test(function(t) { |
- var SCOPE = 'resources/fetch-cors-xhr-iframe.html'; |
+ var SCOPE = 'resources/fetch-csp-iframe.html'; |
var SCRIPT = 'resources/fetch-rewrite-worker.js'; |
var host_info = get_host_info(); |
- |
- login(t, host_info.HTTP_ORIGIN, host_info.HTTP_REMOTE_ORIGIN) |
- .then(function() { |
- return service_worker_unregister_and_register(t, SCRIPT, SCOPE); |
- }) |
+ service_worker_unregister_and_register(t, SCRIPT, SCOPE) |
.then(function(registration) { |
return wait_for_state(t, registration.installing, 'activated'); |
}) |
@@ -28,11 +23,10 @@ async_test(function(t) { |
service_worker_unregister_and_done(t, SCOPE); |
}); |
frame.contentWindow.postMessage({}, |
- host_info['HTTP_ORIGIN'], |
+ host_info['HTTPS_ORIGIN'], |
[channel.port2]); |
}); |
}) |
.catch(unreached_rejection(t)); |
- }, 'Verify CORS XHR of fetch() in a Service Worker'); |
+ }, 'Verify CSP control of fetch() in a Service Worker'); |
</script> |
-</body> |