Index: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html |
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html |
similarity index 66% |
copy from third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html |
copy to third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html |
index d35b3807b2ef9d48b9ae4b1a6edeba44cab6df1b..a7db229cecc106cb5ff9731da8c29c132987db3b 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html |
+++ b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html |
@@ -1,7 +1,7 @@ |
-<script src="../../resources/get-host-info.js?pipe=sub"></script> |
-<script src="test-helpers.js"></script> |
+<script src="../resources/get-host-info.sub.js"></script> |
+<script src="test-helpers.sub.js?pipe=sub"></script> |
<script> |
-var image_path = base_path() + 'fetch-access-control.php?PNGIMAGE'; |
+var image_path = base_path() + 'fetch-access-control.py?PNGIMAGE'; |
var host_info = get_host_info(); |
var results = ''; |
@@ -38,13 +38,27 @@ function test3() { |
document.body.appendChild(img); |
img.onload = function() { |
results += 'FAIL(3)'; |
+ test4(); |
+ }; |
+ img.onerror = function() { |
+ test4(); |
+ }; |
+ img.src = './dummy?mode=no-cors&url=' + |
+ encodeURIComponent(host_info['HTTP_ORIGIN'] + image_path); |
+} |
+ |
+function test4() { |
+ var img = document.createElement('img'); |
+ document.body.appendChild(img); |
+ img.onload = function() { |
+ results += 'FAIL(4)'; |
finish(); |
}; |
img.onerror = function() { |
finish(); |
}; |
img.src = './dummy?mode=no-cors&url=' + |
- encodeURIComponent(host_info['UNAUTHENTICATED_ORIGIN'] + image_path); |
+ encodeURIComponent(host_info['HTTP_REMOTE_ORIGIN'] + image_path); |
} |
function finish() { |