| Index: third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
|
| similarity index 71%
|
| copy from third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
|
| copy to third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
|
| index dc7c47b3baed5d46d0b3df3c47adedfb4a948c9c..cec00cb25e44a27d109c9024a9458c5d7de55014 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
|
| +++ b/third_party/WebKit/LayoutTests/imported/wpt/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.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 = '';
|
|
|
| @@ -41,17 +41,30 @@ function test3() {
|
| img.onerror = function() {
|
| test4();
|
| };
|
| - img.src = host_info['UNAUTHENTICATED_ORIGIN'] + image_path;
|
| + img.src = host_info['HTTP_ORIGIN'] + image_path;
|
| }
|
|
|
| function test4() {
|
| var img = document.createElement('img');
|
| document.body.appendChild(img);
|
| img.onload = function() {
|
| + results += 'FAIL(4)';
|
| + test5();
|
| + };
|
| + img.onerror = function() {
|
| + test5();
|
| + };
|
| + img.src = host_info['HTTP_REMOTE_ORIGIN'] + image_path;
|
| +}
|
| +
|
| +function test5() {
|
| + var img = document.createElement('img');
|
| + document.body.appendChild(img);
|
| + img.onload = function() {
|
| finish();
|
| };
|
| img.onerror = function() {
|
| - results += 'FAIL(4)';
|
| + results += 'FAIL(5)';
|
| finish();
|
| };
|
| img.src = './dummy?generate-png';
|
|
|