diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index b80f9eb12348..d8f873e4cb54 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -60041,11 +60041,6 @@
      {}
     ]
    ],
-   "service-workers/service-worker/resources/get-host-info.sub.js": [
-    [
-     {}
-    ]
-   ],
    "service-workers/service-worker/resources/indexeddb-worker.js": [
     [
      {}
@@ -138489,7 +138484,7 @@
    "support"
   ],
   "common/get-host-info.sub.js": [
-   "4feb5667d2093736391c71b8f0224f6d868c8cf4",
+   "eade85ef5ac0eb56ba5ecf8057ab7a4ea05a22e1",
    "support"
   ],
   "common/large.py": [
@@ -177893,7 +177888,7 @@
    "testharness"
   ],
   "html/webappapis/idle-callbacks/cancel-invoked.html": [
-   "d0128b4d4b805a58926ad895f35b341321cf56ec",
+   "30787d765fa435c1392bd852559042bf3c2e2553",
    "testharness"
   ],
   "html/webappapis/idle-callbacks/idlharness.html": [
@@ -198301,15 +198296,15 @@
    "testharness"
   ],
   "service-workers/service-worker/client-navigate.https.html": [
-   "79904ed11a3c53c4559c8f44603fcc1cf0a05844",
+   "e0c704605ec008a29662e1804d512284899ddd6f",
    "testharness"
   ],
   "service-workers/service-worker/clients-get-cross-origin.https.html": [
-   "7e9d0cd022aa70a0f38b2f15f05919e9ff185728",
+   "21ed1eab21bb6f0b342895c8185ecb92afe93b79",
    "testharness"
   ],
   "service-workers/service-worker/clients-get.https.html": [
-   "54c7ac17c93881644c202dbacf36de2fc507a3f5",
+   "32ccf7734a7d0d40205c4fd30b393b175e6507bd",
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-client-types.https.html": [
@@ -198345,19 +198340,19 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-canvas-tainting-cache.https.html": [
-   "3401c0848a63c619c618d4a2cf3c59f3928ff162",
+   "b3f8375bc412c99099ac886673fd80f6cb0a312b",
    "testharness"
   ],
   "service-workers/service-worker/fetch-canvas-tainting.https.html": [
-   "1f2d87f214450395472fe3dffcb2783e71ec0d52",
+   "9c2e160f95d2915a961bd7da840ac53779c9387d",
    "testharness"
   ],
   "service-workers/service-worker/fetch-cors-xhr.https.html": [
-   "5a35a77eb5575e181aee035ffa103f51152fda54",
+   "448c071ddeaaaf828800d8fad20d8ce672e56590",
    "testharness"
   ],
   "service-workers/service-worker/fetch-csp.https.html": [
-   "b9ff203833b7af8b0181eea9a1778b9e4d20ccb1",
+   "97fff975592937acda3e8f363685dc9a835c12be",
    "testharness"
   ],
   "service-workers/service-worker/fetch-event-after-navigation-within-page.https.html": [
@@ -198373,7 +198368,7 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-event-redirect.https.html": [
-   "5d4efd3504c37f5b728eef4941266b3d1d8842e7",
+   "e322139b14149fe9b3f3aff76a9af8a58437e715",
    "testharness"
   ],
   "service-workers/service-worker/fetch-event-respond-with-stops-propagation.https.html": [
@@ -198381,35 +198376,35 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-event.https.html": [
-   "9197ebb50014905e02645c5dc71d467be0e7604c",
+   "ce7785af8286cd371cc08092903c333332deb862",
    "testharness"
   ],
   "service-workers/service-worker/fetch-frame-resource.https.html": [
-   "e5996d90c4c383eda2947cc2bc39e734448b3bde",
+   "77709ff94cfaeec0b01e157714244d1b568c6b18",
    "testharness"
   ],
   "service-workers/service-worker/fetch-header-visibility.https.html": [
-   "c12941b5e391a520b20f227fd515089ac922f50e",
+   "054a581d2585cf34e4f0626870c2a093d53dc09b",
    "testharness"
   ],
   "service-workers/service-worker/fetch-mixed-content-to-inscope.https.html": [
-   "16bf962ab092624da480de9a75ac767cdc00c2c7",
+   "e3035bdf8cec65bb0322b5dfce10a3a827bd415e",
    "testharness"
   ],
   "service-workers/service-worker/fetch-mixed-content-to-outscope.https.html": [
-   "431348eba25f6db93684b39dcdc9eb29071e27f1",
+   "45a83eeeb922301fc399a4808bb4d1014a541733",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-css-base-url.https.html": [
-   "e9e6bc4ecfe69bf5f1c8fa718f15fe19ca612143",
+   "01a5220ff2abe5735d7b03c2ee3ccbe21c9a260e",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-css-images.https.html": [
-   "14c5ad1b9e3971c994ec9134989f03ff4a01962c",
+   "ca776bff1f106f9a1e2dfe4d25ff3618d99758b7",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-fallback.https.html": [
-   "11b3e5fe92d27ea1058f725a904a4ed8e448a2dd",
+   "60dcb3a4c3b3ca2e79adfc7b779724cbe3ffa1c4",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-no-freshness-headers.https.html": [
@@ -198417,23 +198412,23 @@
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-redirect.https.html": [
-   "ffe217a363c6db265aaa2f45661bdc3a4289c9a0",
+   "e0c2c7752674bd8bb65ce09bc1d49b2f5d458d54",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-resources.https.html": [
-   "6676e514ba04f2759346eaa94f1c87c8290e44cd",
+   "5ae2d1ae4eec846002635d6ff8d9d7c9a2aebd3f",
    "testharness"
   ],
   "service-workers/service-worker/fetch-request-xhr.https.html": [
-   "760037db448b32b146c51ba8e7c453dd9c734a6e",
+   "840aafe30e5a0c8129c05e3b311084b8c00267a6",
    "testharness"
   ],
   "service-workers/service-worker/fetch-response-xhr.https.html": [
-   "b6fa000865a6961afabb592a09bbf686ee4302df",
+   "6d50c69d78a1eb077108209b94fdf0efe540883d",
    "testharness"
   ],
   "service-workers/service-worker/fetch-waits-for-activate.https.html": [
-   "9be9d969099e27be5edc15f6014ac2f06f81674c",
+   "04eeedc3f074aff32281a438acda62b7a6d86e2d",
    "testharness"
   ],
   "service-workers/service-worker/getregistration.https.html": [
@@ -198441,7 +198436,7 @@
    "testharness"
   ],
   "service-workers/service-worker/getregistrations.https.html": [
-   "8b66990c80dfb44f43a053829005dbca2264106c",
+   "d76c66c08bd5c1addbdb149447f2268ac52ffcb2",
    "testharness"
   ],
   "service-workers/service-worker/indexeddb.https.html": [
@@ -198461,11 +198456,11 @@
    "testharness"
   ],
   "service-workers/service-worker/invalid-blobtype.https.html": [
-   "ff9dca8c16a3635b74a7dfbff8ae5061b89a86e5",
+   "ca29ab7c214d2fa4973cf7be633a7fb8507ae897",
    "testharness"
   ],
   "service-workers/service-worker/invalid-header.https.html": [
-   "559a924fa530f4a4082c306d5821d88f9d2ba064",
+   "393c3b3c393b58e74f82affecdd06c4e7be1787a",
    "testharness"
   ],
   "service-workers/service-worker/multiple-register.https.html": [
@@ -198477,11 +198472,11 @@
    "testharness"
   ],
   "service-workers/service-worker/navigate-window.https.html": [
-   "fe503981bd965d0d424f4c2e404ab940a2d6db0b",
+   "669507683c98d99aa5dcfbddd71c23f8464b7c21",
    "testharness"
   ],
   "service-workers/service-worker/navigation-redirect.https.html": [
-   "919eb3d5d1203626cc6e23a5200033cb8a756347",
+   "7d9f8501624e1832170d427657d6dbf19253c989",
    "testharness"
   ],
   "service-workers/service-worker/onactivate-script-error.https.html": [
@@ -198501,7 +198496,7 @@
    "testharness"
   ],
   "service-workers/service-worker/postmessage-to-client.https.html": [
-   "8a96689891c9e49456c48e47a09405fe2edb4cce",
+   "4f91d302091df45ca72567c2cedc1584ad9045a9",
    "testharness"
   ],
   "service-workers/service-worker/postmessage.https.html": [
@@ -198513,11 +198508,11 @@
    "testharness"
   ],
   "service-workers/service-worker/referer.https.html": [
-   "3a78997f47e3f53bcb94f871032b0d6099361f10",
+   "a9e4073192f5b69984624ad7376ec7787101dfea",
    "testharness"
   ],
   "service-workers/service-worker/register-closed-window.https.html": [
-   "bc6e9bb358fdd6b66d49eaf99e9d5f2e111c874b",
+   "2e24c6664881449ab67f04b860a701c8b8ef93c1",
    "testharness"
   ],
   "service-workers/service-worker/register-default-scope.https.html": [
@@ -198565,7 +198560,7 @@
    "testharness"
   ],
   "service-workers/service-worker/resource-timing.https.html": [
-   "003956c17576fa4e0f1c7a5cc7aaf6bb211510ff",
+   "587060940cb25ff8072fa83cb41d538a73320ca6",
    "testharness"
   ],
   "service-workers/service-worker/resources/404.py": [
@@ -198601,7 +198596,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/client-navigate-worker.js": [
-   "28442dc3f2bb1b2761a17ae599b1300c50327a56",
+   "6b277e1dcde40babec32046f9e637a47830bf29b",
    "support"
   ],
   "service-workers/service-worker/resources/client-navigated-frame.html": [
@@ -198613,7 +198608,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/clients-get-other-origin.html": [
-   "2bcea64745be9b6aab7d91eb2c54774b8110bb6f",
+   "1b495621d4024d18579626cc5fd6049789bce115",
    "support"
   ],
   "service-workers/service-worker/resources/clients-get-worker.js": [
@@ -198637,7 +198632,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/dummy-worker-interceptor.js": [
-   "5bad22ca85e049d9ccd1228cef98f58bbf21a16a",
+   "f631d35c4eed6be4a8e6d2cdc5258ac0b169e177",
    "support"
   ],
   "service-workers/service-worker/resources/dummy-worker-script.py": [
@@ -198693,15 +198688,15 @@
    "support"
   ],
   "service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html": [
-   "238c7a5082169f5a96160aa298d0450c9e1ed60b",
+   "04c234d3cc210d24962ce2b7cbbefcbd16d335e8",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-cors-xhr-iframe.html": [
-   "a95c7def61681468026031380425f03d3020d66a",
+   "bbed4c0dcae12d91bcda4241103e674a6ffc73b1",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-csp-iframe.html": [
-   "b84cb08bd5e4504dc5509f78ca3a4c07be702814",
+   "0c82ccc773dc644bac0cef39faadcb3280c0c6f4",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-csp-iframe.html.sub.headers": [
@@ -198737,19 +198732,19 @@
    "support"
   ],
   "service-workers/service-worker/resources/fetch-header-visibility-iframe.html": [
-   "99c91098d8df9e0b840699770d240bb0aa2ee715",
+   "f5975491b4c516cdfc62eaaba019ab546451d6e7",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html": [
-   "7cf39eebde4a25c1af8690c28db50ef0a4b147cd",
+   "7485fa9c96fbbc4af9de634e0738957dd6ab2aa0",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html": [
-   "623898c5d5975ae661f8b2375af2a1aaf2859c23",
+   "c9a7ec401f8db3416e73694370be0b711f04110e",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-mixed-content-iframe.html": [
-   "bb8ade5c70097997726faf2624b11581e4cfe2f1",
+   "1b7a67809f06e5a14ca77da10d9c43e94f5dc1f0",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-request-css-base-url-iframe.html": [
@@ -198761,7 +198756,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/fetch-request-css-base-url-worker.js": [
-   "4536000808809f0354c6b206380d92f4e2fddd0e",
+   "30e4285e144a5c9caa0dd48224cefc4b41973de1",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-request-fallback-iframe.html": [
@@ -198793,7 +198788,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html": [
-   "2a1cb00d377b6a3460daf9727828af0040756420",
+   "e28b416c027c2ed1a633c0804ef826cad99509ff",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-request-xhr-worker.js": [
@@ -198801,7 +198796,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html": [
-   "bdba81b06c43907a879b992ea20a77526a0e8810",
+   "8bef6d586f438fa912c7e40ac82a5aa73e05706a",
    "support"
   ],
   "service-workers/service-worker/resources/fetch-response-xhr-worker.js": [
@@ -198820,10 +198815,6 @@
    "c5f88c11333ff1faba5d57812a36553d174ab711",
    "support"
   ],
-  "service-workers/service-worker/resources/get-host-info.sub.js": [
-   "b9310fbd533b9382c3413bbcf2d49f778d4737dd",
-   "support"
-  ],
   "service-workers/service-worker/resources/indexeddb-worker.js": [
    "ed0ff45423ba74ad0b82e46debd865fdae2fbcb6",
    "support"
@@ -198889,7 +198880,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/navigation-redirect-other-origin.html": [
-   "a43dcad198cad8b1589de1963342c75a0b70d1e9",
+   "8c51024d8e369bc5ae21e94c486c59690df2de3e",
    "support"
   ],
   "service-workers/service-worker/resources/navigation-redirect-out-scope.py": [
@@ -198981,7 +198972,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/referer-iframe.html": [
-   "f7dc2c960e0bbe78ea14d66d9ee76e7876c29b90",
+   "6b549d0a185a0fb76c230274a672ef4843d33a90",
    "support"
   ],
   "service-workers/service-worker/resources/register-closed-window-iframe.html": [
@@ -199013,7 +199004,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/service-worker-csp-worker.py": [
-   "f91ff42d4a88961aeb4c29cce61db8ad32261f4e",
+   "f7c6bb3ba222dc35a09ef806a7c6d145339f9eb2",
    "support"
   ],
   "service-workers/service-worker/resources/shared-worker-controlled.js": [
@@ -199101,11 +199092,11 @@
    "support"
   ],
   "service-workers/service-worker/resources/worker-interception-iframe.https.html": [
-   "06594aaad28018acf9e670b23eb97e8b0b7e1b98",
+   "b9fd4ea281b328c1f21573d1563c968dac52cf22",
    "support"
   ],
   "service-workers/service-worker/resources/worker-load-interceptor.js": [
-   "8e92e777917d2e39558a7609d34ec839f24e5fac",
+   "de9cfcbef6528a4b5e6b2552f260501e4d165ea4",
    "support"
   ],
   "service-workers/service-worker/resources/worker-testharness.js": [
@@ -199209,7 +199200,7 @@
    "testharness"
   ],
   "service-workers/service-worker/websocket.https.html": [
-   "41a6008966629c84ffba592e038adae1050c947a",
+   "40ec7850c61a3ee7578f055d3eef87293cfad482",
    "testharness"
   ],
   "service-workers/service-worker/worker-interception.https.html": [
@@ -199217,7 +199208,7 @@
    "testharness"
   ],
   "service-workers/service-worker/xhr.https.html": [
-   "e306f2662c779b7fe2b3727e6ee9a27c7c95a151",
+   "f5d565c95c7a08da139b0f3b95bb0cfb0ae2b936",
    "testharness"
   ],
   "service-workers/specgen.json": [
@@ -218077,7 +218068,7 @@
    "testharness"
   ],
   "workers/interfaces.idl": [
-   "8b1a9f8688e38a009fa82936610ca221541bafbc",
+   "d8961ea6af91a92a064bcf0e0da5b56781f6bc6b",
    "support"
   ],
   "workers/interfaces.worker.js": [
diff --git a/testing/web-platform/tests/service-workers/service-worker/client-navigate.https.html b/testing/web-platform/tests/service-workers/service-worker/client-navigate.https.html
index a505e8722791..b651a20a1119 100644
--- a/testing/web-platform/tests/service-workers/service-worker/client-navigate.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/client-navigate.https.html
@@ -3,7 +3,7 @@
 <title>Service Worker: WindowClient.navigate</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
   function wait_for_message(msg) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/clients-get-cross-origin.https.html b/testing/web-platform/tests/service-workers/service-worker/clients-get-cross-origin.https.html
index 3413acbf9d5a..d5622054de82 100644
--- a/testing/web-platform/tests/service-workers/service-worker/clients-get-cross-origin.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/clients-get-cross-origin.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: Clients.get across origins</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/clients-get.https.html b/testing/web-platform/tests/service-workers/service-worker/clients-get.https.html
index af38502dd9fc..85c70a2f1dc8 100644
--- a/testing/web-platform/tests/service-workers/service-worker/clients-get.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/clients-get.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: Clients.get</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-cache.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-cache.https.html
index fdb64e15d66b..747549352402 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-cache.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting-cache.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: canvas tainting of the fetched image using cached responses</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting.https.html
index bb75473926fb..55faa9df7a98 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-canvas-tainting.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: canvas tainting of the fetched image</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-cors-xhr.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-cors-xhr.https.html
index 3b1f1d6bc321..521c01c594f2 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-cors-xhr.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-cors-xhr.https.html
@@ -2,7 +2,7 @@
 <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.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-csp.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-csp.https.html
index bdb56c213af6..9f3365056a98 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-csp.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-csp.https.html
@@ -2,7 +2,7 @@
 <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="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-event-redirect.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-event-redirect.https.html
index 17f4cb15e80e..54eb4bc9f552 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-event-redirect.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-event-redirect.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="resources/testharness-helpers.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-event.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-event.https.html
index 6f8618bad7ec..b89d362b1886 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-event.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-event.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-frame-resource.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-frame-resource.https.html
index fd7419832431..4d30ff4caf71 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-frame-resource.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-frame-resource.https.html
@@ -3,7 +3,7 @@
 <meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-header-visibility.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-header-visibility.https.html
index 36bf16f32798..1ceb164653b9 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-header-visibility.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-header-visibility.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: Visibility of headers during 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="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html
index fb9fa9b7b717..2a0342fee00b 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html
@@ -3,7 +3,7 @@
 <meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body></body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html
index cee89ce167d9..28b43acc8639 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html
@@ -3,7 +3,7 @@
 <meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <body></body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-base-url.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-base-url.https.html
index 0405ed70905e..7c6652030457 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-base-url.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-base-url.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: CSS's base URL must be the request URL even when fetched from other URL</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.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) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-images.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-images.https.html
index 777308241e4f..6f323cac8d11 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-images.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-request-css-images.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: FetchEvent for css image</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 var SCOPE = 'resources/fetch-request-resources-iframe.https.html';
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-request-fallback.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-request-fallback.https.html
index 8290e21dd3e7..57934d535ada 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-request-fallback.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-request-fallback.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: the fallback behavior of FetchEvent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 var expected_urls = [];
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-request-redirect.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-request-redirect.https.html
index 25d4a6ef32b5..4cefad3a74b2 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-request-redirect.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-request-redirect.https.html
@@ -3,7 +3,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-request-resources.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-request-resources.https.html
index 7a64e9444dc9..5536304ff637 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-request-resources.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-request-resources.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: FetchEvent for resources</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 var url_count = 0;
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-request-xhr.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-request-xhr.https.html
index 1b80985a356c..87af41099940 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-request-xhr.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-request-xhr.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: the body of FetchEvent using XMLHttpRequest</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.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) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-response-xhr.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-response-xhr.https.html
index 8b66c6051782..24eb44e222ec 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-response-xhr.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-response-xhr.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: the response of FetchEvent using XMLHttpRequest</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.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) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/fetch-waits-for-activate.https.html b/testing/web-platform/tests/service-workers/service-worker/fetch-waits-for-activate.https.html
index 304680c97e63..2c9d4a59dc18 100644
--- a/testing/web-platform/tests/service-workers/service-worker/fetch-waits-for-activate.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/fetch-waits-for-activate.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="resources/testharness-helpers.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/getregistrations.https.html b/testing/web-platform/tests/service-workers/service-worker/getregistrations.https.html
index b65a97869561..036764d11332 100644
--- a/testing/web-platform/tests/service-workers/service-worker/getregistrations.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/getregistrations.https.html
@@ -3,7 +3,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="../fetch/resources/fetch-test-helpers.sub.js"></script>
 <script>
 // Purge the existing registrations for the origin.
diff --git a/testing/web-platform/tests/service-workers/service-worker/invalid-blobtype.https.html b/testing/web-platform/tests/service-workers/service-worker/invalid-blobtype.https.html
index f1f2d1bdc618..868cf6e78c30 100644
--- a/testing/web-platform/tests/service-workers/service-worker/invalid-blobtype.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/invalid-blobtype.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: respondWith with header value containing a null byte</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.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) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/invalid-header.https.html b/testing/web-platform/tests/service-workers/service-worker/invalid-header.https.html
index 794695264936..b771f3c93968 100644
--- a/testing/web-platform/tests/service-workers/service-worker/invalid-header.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/invalid-header.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: respondWith with header value containing a null byte</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.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) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/navigate-window.https.html b/testing/web-platform/tests/service-workers/service-worker/navigate-window.https.html
index e3aaf4c5cd42..31e800f2904b 100644
--- a/testing/web-platform/tests/service-workers/service-worker/navigate-window.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/navigate-window.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: Navigate a Window</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/navigation-redirect.https.html b/testing/web-platform/tests/service-workers/service-worker/navigation-redirect.https.html
index 7b606cf0c3c0..586e9036a3e9 100644
--- a/testing/web-platform/tests/service-workers/service-worker/navigation-redirect.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/navigation-redirect.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: Navigation redirection</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client.https.html b/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client.https.html
index 2ee98084680a..8eac04a63d91 100644
--- a/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: postMessage to Client</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 var frame;
diff --git a/testing/web-platform/tests/service-workers/service-worker/referer.https.html b/testing/web-platform/tests/service-workers/service-worker/referer.https.html
index 9b3565329ecc..43fccbad56cf 100644
--- a/testing/web-platform/tests/service-workers/service-worker/referer.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/referer.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: check referer 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="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 async_test(function(t) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/register-closed-window.https.html b/testing/web-platform/tests/service-workers/service-worker/register-closed-window.https.html
index 22135671625a..9c1b639bb757 100644
--- a/testing/web-platform/tests/service-workers/service-worker/register-closed-window.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/register-closed-window.https.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="resources/testharness-helpers.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html b/testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html
index f33c41d715ec..797896759fe6 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resource-timing.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
 function resourceUrl(path) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/client-navigate-worker.js b/testing/web-platform/tests/service-workers/service-worker/resources/client-navigate-worker.js
index 3f2424078812..59866e7d8945 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/client-navigate-worker.js
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/client-navigate-worker.js
@@ -1,6 +1,6 @@
 importScripts("worker-testharness.js");
 importScripts("test-helpers.sub.js");
-importScripts("get-host-info.sub.js")
+importScripts("/common/get-host-info.sub.js")
 importScripts("testharness-helpers.js")
 
 self.onfetch = function(e) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/clients-get-other-origin.html b/testing/web-platform/tests/service-workers/service-worker/resources/clients-get-other-origin.html
index cbd3dcc6f3b1..6342fe04f404 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/clients-get-other-origin.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/clients-get-other-origin.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<script src="get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js"></script>
 <script>
 var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/dummy-worker-interceptor.js b/testing/web-platform/tests/service-workers/service-worker/resources/dummy-worker-interceptor.js
index 43244e1d9930..abec5fdd58b2 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/dummy-worker-interceptor.js
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/dummy-worker-interceptor.js
@@ -1,4 +1,4 @@
-importScripts('get-host-info.sub.js');
+importScripts('/common/get-host-info.sub.js');
 
 var worker_text = 'postMessage("worker loading intercepted by service worker"); ';
 
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html
index 3822971e80a2..75eca5616115 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-canvas-tainting-iframe.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var image_path = base_path() + 'fetch-access-control.py?PNGIMAGE';
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html
index 121c5c34eacb..1fd809490f6f 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var path = base_path() + 'fetch-access-control.py';
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-csp-iframe.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-csp-iframe.html
index cf7175bc83df..df2183643854 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-csp-iframe.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-csp-iframe.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var image_path = base_path() + 'fetch-access-control.py?PNGIMAGE';
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html
index e0f32f75477c..0d9ab6ff9045 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-header-visibility-iframe.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
   var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html
index a7db229cecc1..b6a260d066bf 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var image_path = base_path() + 'fetch-access-control.py?PNGIMAGE';
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
index cec00cb25e44..b8c940c2a0a5 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var image_path = base_path() + 'fetch-access-control.py?PNGIMAGE';
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html
index 961fd2ab6993..2831c381b5e4 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var params = get_query_params(location.href);
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js
index 0d9244ec75ca..91c325998a3b 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js
@@ -1,4 +1,4 @@
-importScripts('../resources/get-host-info.sub.js');
+importScripts('/common/get-host-info.sub.js');
 importScripts('test-helpers.sub.js');
 
 var port = undefined;
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
index 26c6b7344677..ef2f925aa5f1 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var port;
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html
index 3391381e38af..08b887b7de66 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/get-host-info.sub.js b/testing/web-platform/tests/service-workers/service-worker/resources/get-host-info.sub.js
deleted file mode 100644
index b64334df667d..000000000000
--- a/testing/web-platform/tests/service-workers/service-worker/resources/get-host-info.sub.js
+++ /dev/null
@@ -1,26 +0,0 @@
-function get_host_info() {
-  var ORIGINAL_HOST = '127.0.0.1';
-  var REMOTE_HOST = 'localhost';
-  var UNAUTHENTICATED_HOST = 'example.test';
-  var HTTP_PORT = 8000;
-  var HTTPS_PORT = 8443;
-  try {
-    // In W3C test, we can get the hostname and port number in config.json
-    // using wptserve's built-in pipe.
-    // http://wptserve.readthedocs.org/en/latest/pipes.html#built-in-pipes
-    HTTP_PORT = eval('{{ports[http][0]}}');
-    HTTPS_PORT = eval('{{ports[https][0]}}');
-    ORIGINAL_HOST = eval('\'{{host}}\'');
-    REMOTE_HOST = 'www1.' + ORIGINAL_HOST;
-  } catch (e) {
-  }
-  return {
-    HTTP_ORIGIN: 'http://' + ORIGINAL_HOST + ':' + HTTP_PORT,
-    HTTPS_ORIGIN: 'https://' + ORIGINAL_HOST + ':' + HTTPS_PORT,
-    HTTPS_ORIGIN_WITH_CREDS: 'https://foo:bar@' + ORIGINAL_HOST + ':' + HTTPS_PORT,
-    HTTP_REMOTE_ORIGIN: 'http://' + REMOTE_HOST + ':' + HTTP_PORT,
-    HTTPS_REMOTE_ORIGIN: 'https://' + REMOTE_HOST + ':' + HTTPS_PORT,
-    HTTPS_REMOTE_ORIGIN_WITH_CREDS: 'https://foo:bar@' + REMOTE_HOST + ':' + HTTPS_PORT,
-    UNAUTHENTICATED_ORIGIN: 'http://' + UNAUTHENTICATED_HOST + ':' + HTTP_PORT
-  };
-}
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html b/testing/web-platform/tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html
index c1441ba685a4..8688c8a8000b 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/navigation-redirect-other-origin.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<script src="get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js"></script>
 <script>
 var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/referer-iframe.html b/testing/web-platform/tests/service-workers/service-worker/resources/referer-iframe.html
index 491262e9dc13..295ff4567154 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/referer-iframe.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/referer-iframe.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js"></script>
 <script>
 function check_referer(url, expected_referer) {
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/service-worker-csp-worker.py b/testing/web-platform/tests/service-workers/service-worker/resources/service-worker-csp-worker.py
index 4e5c6f3b6ea0..5f06454f144d 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/service-worker-csp-worker.py
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/service-worker-csp-worker.py
@@ -1,7 +1,7 @@
 bodyDefault = '''
 importScripts('worker-testharness.js');
 importScripts('test-helpers.sub.js');
-importScripts('../resources/get-host-info.sub.js');
+importScripts('/common/get-host-info.sub.js');
 
 var host_info = get_host_info();
 
@@ -47,7 +47,7 @@ async_test(function(t) {
 bodyScript = '''
 importScripts('worker-testharness.js');
 importScripts('test-helpers.sub.js');
-importScripts('../resources/get-host-info.sub.js');
+importScripts('/common/get-host-info.sub.js');
 
 var host_info = get_host_info();
 
@@ -93,7 +93,7 @@ async_test(function(t) {
 bodyConnect = '''
 importScripts('worker-testharness.js');
 importScripts('test-helpers.sub.js');
-importScripts('../resources/get-host-info.sub.js');
+importScripts('/common/get-host-info.sub.js');
 
 var host_info = get_host_info();
 
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/worker-interception-iframe.https.html b/testing/web-platform/tests/service-workers/service-worker/resources/worker-interception-iframe.https.html
index 12a461ea5db2..e89b38691cd4 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/worker-interception-iframe.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/worker-interception-iframe.https.html
@@ -1,4 +1,4 @@
-<script src="../resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="test-helpers.sub.js?pipe=sub"></script>
 <script>
 var host_info = get_host_info();
diff --git a/testing/web-platform/tests/service-workers/service-worker/resources/worker-load-interceptor.js b/testing/web-platform/tests/service-workers/service-worker/resources/worker-load-interceptor.js
index 960c6328ce53..695777a514f6 100644
--- a/testing/web-platform/tests/service-workers/service-worker/resources/worker-load-interceptor.js
+++ b/testing/web-platform/tests/service-workers/service-worker/resources/worker-load-interceptor.js
@@ -1,4 +1,4 @@
-importScripts('get-host-info.sub.js');
+importScripts('/common/get-host-info.sub.js');
 
 var response_text = "This load was successfully intercepted.";
 var response_script = "postMessage(\"This load was successfully intercepted.\");";
diff --git a/testing/web-platform/tests/service-workers/service-worker/websocket.https.html b/testing/web-platform/tests/service-workers/service-worker/websocket.https.html
index 3dfa6e51497c..b9c526d50fb9 100644
--- a/testing/web-platform/tests/service-workers/service-worker/websocket.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/websocket.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: WebSocket handshake channel is not intercepted</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
 
diff --git a/testing/web-platform/tests/service-workers/service-worker/xhr.https.html b/testing/web-platform/tests/service-workers/service-worker/xhr.https.html
index 776e61db16dd..0805cf84dfa2 100644
--- a/testing/web-platform/tests/service-workers/service-worker/xhr.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/xhr.https.html
@@ -2,7 +2,7 @@
 <title>Service Worker: XHR doesn't exist</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/get-host-info.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>