diff --git a/server-timing/cross_origin.html b/server-timing/cross_origin.html
index 80035888de4137..f5251034c93d7f 100644
--- a/server-timing/cross_origin.html
+++ b/server-timing/cross_origin.html
@@ -4,13 +4,16 @@
     <script src="/resources/testharness.js"></script>
     <script src='/resources/testharnessreport.js'></script>
     <script src="/common/performance-timeline-utils.js"></script>
+    <script src="/common/get-host-info.sub.js"></script>
     <script>
       setup({explicit_done: true})
 
-      const {location: {href}} = document
-      const urls = {}
-      urls['same-origin'] = `${href.substring(0, href.lastIndexOf('/'))}/resources/blue.png`
-      urls['cross-origin'] = urls['same-origin'].replace('://', '://www.')
+      const hostInfo = get_host_info()
+      const resourceUrl = 'server-timing/resources/blue.png'
+      const urls = {
+        'same-origin': `${hostInfo.HTTP_ORIGIN}/${resourceUrl}`,
+        'cross-origin': `${hostInfo.HTTP_REMOTE_ORIGIN}/${resourceUrl}`
+      }
       Object.keys(urls).forEach(function(key) {
         const img = document.createElement('img')
         img.src = urls[key]
diff --git a/server-timing/resources/parsing/0.js b/server-timing/resources/parsing/0.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/0.js
+++ b/server-timing/resources/parsing/0.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/1.js b/server-timing/resources/parsing/1.js
index 220cf1aa28d2c0..03b778bd84560b 100644
--- a/server-timing/resources/parsing/1.js
+++ b/server-timing/resources/parsing/1.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric"}])
+testServerTiming(document.currentScript, [{"name":"metric"}])
diff --git a/server-timing/resources/parsing/10.js b/server-timing/resources/parsing/10.js
index 220cf1aa28d2c0..03b778bd84560b 100644
--- a/server-timing/resources/parsing/10.js
+++ b/server-timing/resources/parsing/10.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric"}])
+testServerTiming(document.currentScript, [{"name":"metric"}])
diff --git a/server-timing/resources/parsing/11.js b/server-timing/resources/parsing/11.js
index 220cf1aa28d2c0..03b778bd84560b 100644
--- a/server-timing/resources/parsing/11.js
+++ b/server-timing/resources/parsing/11.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric"}])
+testServerTiming(document.currentScript, [{"name":"metric"}])
diff --git a/server-timing/resources/parsing/12.js b/server-timing/resources/parsing/12.js
index c32491d0c0146f..fc827f8735a569 100644
--- a/server-timing/resources/parsing/12.js
+++ b/server-timing/resources/parsing/12.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":123.4,"desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":123.4,"desc":"description"}])
diff --git a/server-timing/resources/parsing/13.js b/server-timing/resources/parsing/13.js
index 9b767142e5bab7..02f8c3c84d8ddc 100644
--- a/server-timing/resources/parsing/13.js
+++ b/server-timing/resources/parsing/13.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description","dur":123.4}])
diff --git a/server-timing/resources/parsing/14.js b/server-timing/resources/parsing/14.js
index 153607bfc56bb3..966e9634e3f668 100644
--- a/server-timing/resources/parsing/14.js
+++ b/server-timing/resources/parsing/14.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description"}])
diff --git a/server-timing/resources/parsing/15.js b/server-timing/resources/parsing/15.js
index 311cabe5535b01..afef77d1634010 100644
--- a/server-timing/resources/parsing/15.js
+++ b/server-timing/resources/parsing/15.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric1","dur":12.3,"desc":"description1"},{"name":"metric2","dur":45.6,"desc":"description2"},{"name":"metric3","dur":78.9,"desc":"description3"}])
+testServerTiming(document.currentScript, [{"name":"metric1","dur":12.3,"desc":"description1"},{"name":"metric2","dur":45.6,"desc":"description2"},{"name":"metric3","dur":78.9,"desc":"description3"}])
diff --git a/server-timing/resources/parsing/16.js b/server-timing/resources/parsing/16.js
index ab8597f9170b0d..b49b1785e8cfdf 100644
--- a/server-timing/resources/parsing/16.js
+++ b/server-timing/resources/parsing/16.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric1"},{"name":"metric2"},{"name":"metric3"},{"name":"metric4"},{"name":"metric5"}])
+testServerTiming(document.currentScript, [{"name":"metric1"},{"name":"metric2"},{"name":"metric3"},{"name":"metric4"},{"name":"metric5"}])
diff --git a/server-timing/resources/parsing/17.js b/server-timing/resources/parsing/17.js
index 153607bfc56bb3..966e9634e3f668 100644
--- a/server-timing/resources/parsing/17.js
+++ b/server-timing/resources/parsing/17.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description"}])
diff --git a/server-timing/resources/parsing/18.js b/server-timing/resources/parsing/18.js
index 592475128d021b..3c47d76055a9dc 100644
--- a/server-timing/resources/parsing/18.js
+++ b/server-timing/resources/parsing/18.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"\t description \t"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"\t description \t"}])
diff --git a/server-timing/resources/parsing/19.js b/server-timing/resources/parsing/19.js
index d8cc6b72f5af4f..83fb4f3672fd55 100644
--- a/server-timing/resources/parsing/19.js
+++ b/server-timing/resources/parsing/19.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"descr\"iption"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"descr\"iption"}])
diff --git a/server-timing/resources/parsing/2.js b/server-timing/resources/parsing/2.js
index 6fd97fa66dfaea..b763b8145e5fc5 100644
--- a/server-timing/resources/parsing/2.js
+++ b/server-timing/resources/parsing/2.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":123.4}])
diff --git a/server-timing/resources/parsing/20.js b/server-timing/resources/parsing/20.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/20.js
+++ b/server-timing/resources/parsing/20.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/21.js b/server-timing/resources/parsing/21.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/21.js
+++ b/server-timing/resources/parsing/21.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/22.js b/server-timing/resources/parsing/22.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/22.js
+++ b/server-timing/resources/parsing/22.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/23.js b/server-timing/resources/parsing/23.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/23.js
+++ b/server-timing/resources/parsing/23.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/24.js b/server-timing/resources/parsing/24.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/24.js
+++ b/server-timing/resources/parsing/24.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/25.js b/server-timing/resources/parsing/25.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/25.js
+++ b/server-timing/resources/parsing/25.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/26.js b/server-timing/resources/parsing/26.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/26.js
+++ b/server-timing/resources/parsing/26.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/27.js b/server-timing/resources/parsing/27.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/27.js
+++ b/server-timing/resources/parsing/27.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/28.js b/server-timing/resources/parsing/28.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/28.js
+++ b/server-timing/resources/parsing/28.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/29.js b/server-timing/resources/parsing/29.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/29.js
+++ b/server-timing/resources/parsing/29.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/3.js b/server-timing/resources/parsing/3.js
index 6fd97fa66dfaea..b763b8145e5fc5 100644
--- a/server-timing/resources/parsing/3.js
+++ b/server-timing/resources/parsing/3.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":123.4}])
diff --git a/server-timing/resources/parsing/30.js b/server-timing/resources/parsing/30.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/30.js
+++ b/server-timing/resources/parsing/30.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/31.js b/server-timing/resources/parsing/31.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/31.js
+++ b/server-timing/resources/parsing/31.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/32.js b/server-timing/resources/parsing/32.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/32.js
+++ b/server-timing/resources/parsing/32.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/33.js b/server-timing/resources/parsing/33.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/33.js
+++ b/server-timing/resources/parsing/33.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/34.js b/server-timing/resources/parsing/34.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/34.js
+++ b/server-timing/resources/parsing/34.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/35.js b/server-timing/resources/parsing/35.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/35.js
+++ b/server-timing/resources/parsing/35.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/36.js b/server-timing/resources/parsing/36.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/36.js
+++ b/server-timing/resources/parsing/36.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/37.js b/server-timing/resources/parsing/37.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/37.js
+++ b/server-timing/resources/parsing/37.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/38.js b/server-timing/resources/parsing/38.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/38.js
+++ b/server-timing/resources/parsing/38.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/39.js b/server-timing/resources/parsing/39.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/39.js
+++ b/server-timing/resources/parsing/39.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/4.js b/server-timing/resources/parsing/4.js
index 153607bfc56bb3..966e9634e3f668 100644
--- a/server-timing/resources/parsing/4.js
+++ b/server-timing/resources/parsing/4.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description"}])
diff --git a/server-timing/resources/parsing/40.js b/server-timing/resources/parsing/40.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/40.js
+++ b/server-timing/resources/parsing/40.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/41.js b/server-timing/resources/parsing/41.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/41.js
+++ b/server-timing/resources/parsing/41.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/42.js b/server-timing/resources/parsing/42.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/42.js
+++ b/server-timing/resources/parsing/42.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/43.js b/server-timing/resources/parsing/43.js
index b318cb7299b372..f3ac7dcc2a6cb5 100644
--- a/server-timing/resources/parsing/43.js
+++ b/server-timing/resources/parsing/43.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"\\"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"\\"}])
diff --git a/server-timing/resources/parsing/44.js b/server-timing/resources/parsing/44.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/44.js
+++ b/server-timing/resources/parsing/44.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/45.js b/server-timing/resources/parsing/45.js
index 993a69024cfc0d..82de6a40e5d5ae 100644
--- a/server-timing/resources/parsing/45.js
+++ b/server-timing/resources/parsing/45.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"\""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"\""}])
diff --git a/server-timing/resources/parsing/46.js b/server-timing/resources/parsing/46.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/46.js
+++ b/server-timing/resources/parsing/46.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/47.js b/server-timing/resources/parsing/47.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/47.js
+++ b/server-timing/resources/parsing/47.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/48.js b/server-timing/resources/parsing/48.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/48.js
+++ b/server-timing/resources/parsing/48.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/49.js b/server-timing/resources/parsing/49.js
index 107695e9d2767a..349a7e0dd93cb9 100644
--- a/server-timing/resources/parsing/49.js
+++ b/server-timing/resources/parsing/49.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":""}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":""}])
diff --git a/server-timing/resources/parsing/5.js b/server-timing/resources/parsing/5.js
index 153607bfc56bb3..966e9634e3f668 100644
--- a/server-timing/resources/parsing/5.js
+++ b/server-timing/resources/parsing/5.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description"}])
diff --git a/server-timing/resources/parsing/50.js b/server-timing/resources/parsing/50.js
index 61ec69157222ce..413d9b65bc1f20 100644
--- a/server-timing/resources/parsing/50.js
+++ b/server-timing/resources/parsing/50.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":12.3,"desc":"description1"},{"name":"metric","dur":45.6,"desc":"description2"}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":12.3,"desc":"description1"},{"name":"metric","dur":45.6,"desc":"description2"}])
diff --git a/server-timing/resources/parsing/51.js b/server-timing/resources/parsing/51.js
index c32491d0c0146f..fc827f8735a569 100644
--- a/server-timing/resources/parsing/51.js
+++ b/server-timing/resources/parsing/51.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":123.4,"desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":123.4,"desc":"description"}])
diff --git a/server-timing/resources/parsing/52.js b/server-timing/resources/parsing/52.js
index 6617af517763d9..a97e9d0d0f8951 100644
--- a/server-timing/resources/parsing/52.js
+++ b/server-timing/resources/parsing/52.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"MeTrIc","desc":"DeScRiPtIoN"}])
+testServerTiming(document.currentScript, [{"name":"MeTrIc","desc":"DeScRiPtIoN"}])
diff --git a/server-timing/resources/parsing/53.js b/server-timing/resources/parsing/53.js
index 40faf4106ce210..adf74faaf1b9c1 100644
--- a/server-timing/resources/parsing/53.js
+++ b/server-timing/resources/parsing/53.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":0}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":0}])
diff --git a/server-timing/resources/parsing/54.js b/server-timing/resources/parsing/54.js
index 40faf4106ce210..adf74faaf1b9c1 100644
--- a/server-timing/resources/parsing/54.js
+++ b/server-timing/resources/parsing/54.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":0}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":0}])
diff --git a/server-timing/resources/parsing/55.js b/server-timing/resources/parsing/55.js
index 4e2b14bbddd5bc..429b528375e8e8 100644
--- a/server-timing/resources/parsing/55.js
+++ b/server-timing/resources/parsing/55.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric1","desc":"description","dur":123.4},{"name":"metric2"}])
+testServerTiming(document.currentScript, [{"name":"metric1","desc":"description","dur":123.4},{"name":"metric2"}])
diff --git a/server-timing/resources/parsing/56.js b/server-timing/resources/parsing/56.js
index 6fd97fa66dfaea..b763b8145e5fc5 100644
--- a/server-timing/resources/parsing/56.js
+++ b/server-timing/resources/parsing/56.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":123.4}])
diff --git a/server-timing/resources/parsing/57.js b/server-timing/resources/parsing/57.js
index 40faf4106ce210..adf74faaf1b9c1 100644
--- a/server-timing/resources/parsing/57.js
+++ b/server-timing/resources/parsing/57.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":0}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":0}])
diff --git a/server-timing/resources/parsing/58.js b/server-timing/resources/parsing/58.js
index 13250bbbc53074..05004e5802601e 100644
--- a/server-timing/resources/parsing/58.js
+++ b/server-timing/resources/parsing/58.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description1"}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description1"}])
diff --git a/server-timing/resources/parsing/59.js b/server-timing/resources/parsing/59.js
index 0282f7d51ebee6..c9a9a98c5eb898 100644
--- a/server-timing/resources/parsing/59.js
+++ b/server-timing/resources/parsing/59.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":0,"desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":0,"desc":"description"}])
diff --git a/server-timing/resources/parsing/6.js b/server-timing/resources/parsing/6.js
index c32491d0c0146f..fc827f8735a569 100644
--- a/server-timing/resources/parsing/6.js
+++ b/server-timing/resources/parsing/6.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":123.4,"desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":123.4,"desc":"description"}])
diff --git a/server-timing/resources/parsing/60.js b/server-timing/resources/parsing/60.js
index 0282f7d51ebee6..c9a9a98c5eb898 100644
--- a/server-timing/resources/parsing/60.js
+++ b/server-timing/resources/parsing/60.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":0,"desc":"description"}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":0,"desc":"description"}])
diff --git a/server-timing/resources/parsing/61.js b/server-timing/resources/parsing/61.js
index 62b744cc14351f..ce7d800979e19b 100644
--- a/server-timing/resources/parsing/61.js
+++ b/server-timing/resources/parsing/61.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"","dur":123.4}])
diff --git a/server-timing/resources/parsing/62.js b/server-timing/resources/parsing/62.js
index 62b744cc14351f..ce7d800979e19b 100644
--- a/server-timing/resources/parsing/62.js
+++ b/server-timing/resources/parsing/62.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"","dur":123.4}])
diff --git a/server-timing/resources/parsing/63.js b/server-timing/resources/parsing/63.js
index 839f8064e6f885..d6842ba988d66b 100644
--- a/server-timing/resources/parsing/63.js
+++ b/server-timing/resources/parsing/63.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"d1","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"d1","dur":123.4}])
diff --git a/server-timing/resources/parsing/64.js b/server-timing/resources/parsing/64.js
index d64ea0a9dd16d6..88037d15dd9feb 100644
--- a/server-timing/resources/parsing/64.js
+++ b/server-timing/resources/parsing/64.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric1","desc":"d1"},{"name":"metric2"}])
+testServerTiming(document.currentScript, [{"name":"metric1","desc":"d1"},{"name":"metric2"}])
diff --git a/server-timing/resources/parsing/65.js b/server-timing/resources/parsing/65.js
index 839f8064e6f885..d6842ba988d66b 100644
--- a/server-timing/resources/parsing/65.js
+++ b/server-timing/resources/parsing/65.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"d1","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"d1","dur":123.4}])
diff --git a/server-timing/resources/parsing/66.js b/server-timing/resources/parsing/66.js
index d64ea0a9dd16d6..88037d15dd9feb 100644
--- a/server-timing/resources/parsing/66.js
+++ b/server-timing/resources/parsing/66.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric1","desc":"d1"},{"name":"metric2"}])
+testServerTiming(document.currentScript, [{"name":"metric1","desc":"d1"},{"name":"metric2"}])
diff --git a/server-timing/resources/parsing/67.js b/server-timing/resources/parsing/67.js
index 220cf1aa28d2c0..03b778bd84560b 100644
--- a/server-timing/resources/parsing/67.js
+++ b/server-timing/resources/parsing/67.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric"}])
+testServerTiming(document.currentScript, [{"name":"metric"}])
diff --git a/server-timing/resources/parsing/68.js b/server-timing/resources/parsing/68.js
index 4077b26a61066d..e6946c38dbbbbf 100644
--- a/server-timing/resources/parsing/68.js
+++ b/server-timing/resources/parsing/68.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric1"}])
+testServerTiming(document.currentScript, [{"name":"metric1"}])
diff --git a/server-timing/resources/parsing/69.js b/server-timing/resources/parsing/69.js
index 40faf4106ce210..adf74faaf1b9c1 100644
--- a/server-timing/resources/parsing/69.js
+++ b/server-timing/resources/parsing/69.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","dur":0}])
+testServerTiming(document.currentScript, [{"name":"metric","dur":0}])
diff --git a/server-timing/resources/parsing/7.js b/server-timing/resources/parsing/7.js
index 9b767142e5bab7..02f8c3c84d8ddc 100644
--- a/server-timing/resources/parsing/7.js
+++ b/server-timing/resources/parsing/7.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"description","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"description","dur":123.4}])
diff --git a/server-timing/resources/parsing/70.js b/server-timing/resources/parsing/70.js
index 220cf1aa28d2c0..03b778bd84560b 100644
--- a/server-timing/resources/parsing/70.js
+++ b/server-timing/resources/parsing/70.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric"}])
+testServerTiming(document.currentScript, [{"name":"metric"}])
diff --git a/server-timing/resources/parsing/71.js b/server-timing/resources/parsing/71.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/71.js
+++ b/server-timing/resources/parsing/71.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/72.js b/server-timing/resources/parsing/72.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/72.js
+++ b/server-timing/resources/parsing/72.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/73.js b/server-timing/resources/parsing/73.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/73.js
+++ b/server-timing/resources/parsing/73.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/74.js b/server-timing/resources/parsing/74.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/74.js
+++ b/server-timing/resources/parsing/74.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/75.js b/server-timing/resources/parsing/75.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/75.js
+++ b/server-timing/resources/parsing/75.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/76.js b/server-timing/resources/parsing/76.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/76.js
+++ b/server-timing/resources/parsing/76.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/77.js b/server-timing/resources/parsing/77.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/77.js
+++ b/server-timing/resources/parsing/77.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/78.js b/server-timing/resources/parsing/78.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/78.js
+++ b/server-timing/resources/parsing/78.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/79.js b/server-timing/resources/parsing/79.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/79.js
+++ b/server-timing/resources/parsing/79.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/8.js b/server-timing/resources/parsing/8.js
index 8581efd93ec244..711e3818102876 100644
--- a/server-timing/resources/parsing/8.js
+++ b/server-timing/resources/parsing/8.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"aB3!#$%&'*+-.^_`|~"}])
+testServerTiming(document.currentScript, [{"name":"aB3!#$%&'*+-.^_`|~"}])
diff --git a/server-timing/resources/parsing/80.js b/server-timing/resources/parsing/80.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/80.js
+++ b/server-timing/resources/parsing/80.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/81.js b/server-timing/resources/parsing/81.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/81.js
+++ b/server-timing/resources/parsing/81.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/82.js b/server-timing/resources/parsing/82.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/82.js
+++ b/server-timing/resources/parsing/82.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/83.js b/server-timing/resources/parsing/83.js
index 8de2c0193539ba..2848a1c82bb4d5 100644
--- a/server-timing/resources/parsing/83.js
+++ b/server-timing/resources/parsing/83.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [])
+testServerTiming(document.currentScript, [])
diff --git a/server-timing/resources/parsing/9.js b/server-timing/resources/parsing/9.js
index e03b07a2af1890..3048f3fa7ae970 100644
--- a/server-timing/resources/parsing/9.js
+++ b/server-timing/resources/parsing/9.js
@@ -1 +1 @@
-testServerTiming(document.currentScript.src, [{"name":"metric","desc":"descr;,=iption","dur":123.4}])
+testServerTiming(document.currentScript, [{"name":"metric","desc":"descr;,=iption","dur":123.4}])
diff --git a/server-timing/server_timing_header-parsing.html b/server-timing/server_timing_header-parsing.html
index a598a715b820e5..4049c3dd26568e 100644
--- a/server-timing/server_timing_header-parsing.html
+++ b/server-timing/server_timing_header-parsing.html
@@ -11,28 +11,40 @@
     <script src="/common/performance-timeline-utils.js"></script>
     <script>
       setup({explicit_done: true})
-      function testServerTiming(resource, expectedResults) {
-        const {serverTiming} = performance.getEntriesByName(resource)[0]
-        const fileName = resource.substring(resource.lastIndexOf('/') + 1)
-        test_equals(serverTiming.length, expectedResults.length, `${fileName} - count (${serverTiming.length} ?== ${expectedResults.length})`)
+      const tests = []
+      const urlToIndex = {}
+      function testServerTiming(script, expectedResults) {
+        const url = script.src
+        tests[urlToIndex[url]] = {url, expectedResults}
+      }
+      function runTests() {
+        tests.forEach(function({url, expectedResults}) {
+          debugger;
+          const {serverTiming} = performance.getEntriesByName(url)[0]
+          const fileName = url.substring(url.lastIndexOf('/') + 1)
+
+          test_equals(serverTiming.length, expectedResults.length, `${fileName} - count (${serverTiming.length} ?== ${expectedResults.length})`)
 
-        expectedResults.forEach(function(expectedResult, i) {
-          const dur = expectedResult.dur || 0
-          const desc = expectedResult.desc || ''
-          const index = expectedResults.length === 1 ? '' : `[${i}].`
-          test_equals(expectedResult.name, serverTiming[i].name,
-            `${fileName} - ${index}name (${expectedResult.name} ?== ${serverTiming[i].name})`)
-          test_equals(dur, serverTiming[i].duration,
-            `${fileName} - ${index}duration (${dur} ?== ${serverTiming[i].duration})`)
-          test_equals(desc, serverTiming[i].description,
-            `${fileName} - ${index}description (${desc} ?== ${serverTiming[i].description})`)
+          expectedResults.forEach(function(expectedResult, i) {
+            const dur = expectedResult.dur || 0
+            const desc = expectedResult.desc || ''
+            const index = expectedResults.length === 1 ? '' : `[${i}].`
+            test_equals(expectedResult.name, serverTiming[i].name,
+                `${fileName} - ${index}name (${expectedResult.name} ?== ${serverTiming[i].name})`)
+            test_equals(dur, serverTiming[i].duration,
+                `${fileName} - ${index}duration (${dur} ?== ${serverTiming[i].duration})`)
+            test_equals(desc, serverTiming[i].description,
+                `${fileName} - ${index}description (${desc} ?== ${serverTiming[i].description})`)
+          })
         })
+        done()
       }
       for (let i = 0; i <= 83; i++) {
-        var script = document.createElement('script')
+        const script = document.createElement('script')
         script.src = `./resources/parsing/${i}.js`
         document.getElementsByTagName('head')[0].appendChild(script)
+        urlToIndex[script.src] = i
       }
-      window.addEventListener('load', done)
+      window.addEventListener('load', runTests)
     </script>
 </head>