Chromium Code Reviews Chromium Code Reviews
Issue 1314123002:
Remove hard-coded origins in layout tests. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| Index: LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker-proxied.html |
| diff --git a/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker-proxied.html b/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker-proxied.html |
| index ed1e6a2f77648fea8e580d32de5b514e5408bd38..c1640b7fa60cfacb1559a0e18b66cbd634f69af8 100644 |
| --- a/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker-proxied.html |
| +++ b/LayoutTests/http/tests/fetch/script-tests/thorough/TEMPLATE-serviceworker-proxied.html |
| @@ -3,6 +3,7 @@ |
| <meta name="timeout" content="long"></meta> |
| <script src = "/resources/testharness.js"></script> |
| <script src = "/resources/testharnessreport.js"></script> |
| +<script src = "/resources/get-host-info.js"></script> |
|
hiroshige
2015/09/01 06:22:41
Isn't "?pipe=sub" also needed here?
|
| <script src = "/serviceworker/resources/test-helpers.js"></script> |
| <script src = "/fetch/resources/fetch-test-options.js"></script> |
| <script src = "/fetch/resources/fetch-test-helpers.js"></script> |
| @@ -16,13 +17,17 @@ function onlyOnServiceWorkerProxiedTest(checkFuncs) { |
| </head> |
| <body> |
| <script> |
| +var host_info = get_host_info(); |
| function start(t) { |
| executeServiceWorkerProxiedTests(TEST_TARGETS); |
| t.done(); |
| } |
| function init(test) { |
| - return login(test) |
| - .then(function() {return login_https(test);}); |
| + return login(host_info["HTTP_ORIGIN"], host_info["HTTP_REMOTE_ORIGIN"], test) |
| + .then(function() { |
| + return login(host_info["HTTPS_ORIGIN"], |
| + host_info["HTTPS_REMOTE_ORIGIN"], test); |
| + }); |
| } |
| </script> |
