Bug 1476825 [wpt PR 12061] - Reland "Adjusted references in tests to match new helper.sub.js file", a=testonly
authorIan Clelland <iclelland@chromium.org>
Wed, 25 Jul 2018 17:42:07 +0000
changeset 429024 778051077e97ab6066fc5f98db83d42895d25259
parent 429023 3d6ee559315c468c3c997c7b05ea9942f64f7b3e
child 429025 5d0b2762f48d76582dff4777105fcec3b0a2e7e7
push id34352
push userapavel@mozilla.com
push dateMon, 30 Jul 2018 09:52:49 +0000
treeherdermozilla-central@dead9fcddd4a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1476825, 12061, 739170, 1141725, 576037, 1142169, 576229
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1476825 [wpt PR 12061] - Reland "Adjusted references in tests to match new helper.sub.js file", a=testonly Automatic update from web-platform-testsReland "Adjusted references in tests to match new helper.sub.js file" This is a reland of ac436aaa9d361c99dcf4df11bd11ad201a2bccd8 Original change's description: > Adjusted references in tests to match new helper.sub.js file > > helper.js changed to helper.sub.js. > URLS.safe modified to work with wpt. > > Bug: 739170 > Change-Id: I89e0efdb07c94e78be826c8807d0577ede8a97ec > Reviewed-on: https://chromium-review.googlesource.com/1141725 > Reviewed-by: Mike West <mkwst@chromium.org> > Commit-Queue: Maja Kabus <kabusm@google.com> > Cr-Commit-Position: refs/heads/master@{#576037} Bug: 739170 Tbr: alexmos@chromium.org Change-Id: Idc1e5d5cc4b1dbbc4de4145af38b894c5f4a65b5 Reviewed-on: https://chromium-review.googlesource.com/1142169 Commit-Queue: Ian Clelland <iclelland@chromium.org> Reviewed-by: Ian Clelland <iclelland@chromium.org> Cr-Commit-Position: refs/heads/master@{#576229} -- wpt-commits: 81d058b07f1dacf0445eb4bd20a7df14f8961185 wpt-pr: 12061
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
testing/web-platform/tests/trusted-types/DOMParser.tentative.html
testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
testing/web-platform/tests/trusted-types/HTMLImageElement-src.tentative.html
testing/web-platform/tests/trusted-types/HTMLMediaElement-src.tentative.html
testing/web-platform/tests/trusted-types/HTMLSourceElement-src.tentative.html
testing/web-platform/tests/trusted-types/TrustedHTML.tentative.html
testing/web-platform/tests/trusted-types/TrustedScriptURL.tentative.html
testing/web-platform/tests/trusted-types/TrustedURL.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-embed-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-innerHTML.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-location-assign.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-location-href.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-location-replace.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-outerHTML.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-script-src.tentative.html
testing/web-platform/tests/trusted-types/createContextualFragment.tentative.html
testing/web-platform/tests/trusted-types/document-write.tentative.html
testing/web-platform/tests/trusted-types/embed-src.tentative.html
testing/web-platform/tests/trusted-types/innerHTML.tentative.html
testing/web-platform/tests/trusted-types/insertAdjacentHTML.tentative.html
testing/web-platform/tests/trusted-types/location-assign.tentative.html
testing/web-platform/tests/trusted-types/location-href.tentative.html
testing/web-platform/tests/trusted-types/location-replace.tentative.html
testing/web-platform/tests/trusted-types/outerHTML.tentative.html
testing/web-platform/tests/trusted-types/script-src.tentative.html
testing/web-platform/tests/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
testing/web-platform/tests/trusted-types/srcDoc.tentative.html
testing/web-platform/tests/trusted-types/support/helper.js
testing/web-platform/tests/trusted-types/support/helper.sub.js
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -296998,17 +296998,17 @@
      {}
     ]
    ],
    "trusted-types/META.yml": [
     [
      {}
     ]
    ],
-   "trusted-types/support/helper.js": [
+   "trusted-types/support/helper.sub.js": [
     [
      {}
     ]
    ],
    "uievents/META.yml": [
     [
      {}
     ]
@@ -620683,157 +620683,157 @@
    "2a881ca193964ba19a1ecfa6e842e7bf49d1496f",
    "support"
   ],
   "touch-events/touch-touchevent-constructor.html": [
    "11c8d88f78cb3e857479000332af49484da99212",
    "testharness"
   ],
   "trusted-types/DOMParser-requiresTrustedTypes.tentative.html": [
-   "0846d9c9f9c97063915cee559bcf4a3e711e9887",
+   "f9b9110f3620949c26b9ae047730b2def936a812",
    "testharness"
   ],
   "trusted-types/DOMParser.tentative.html": [
-   "a32d31137bcfc113ce1ca9f75c9770d3501364d5",
+   "95e12b63536c98404993ddf9b6b90e248f56db31",
    "testharness"
   ],
   "trusted-types/HTMLBaseElement-href.tentative.html": [
-   "5b387ae813ec359650618081128001955c7024e2",
+   "bdc6593b4490bd0a1b22ef423c7fc95468acd7e5",
    "testharness"
   ],
   "trusted-types/HTMLImageElement-src.tentative.html": [
-   "1ac2d898da5cb684f642250760dce70b0e130489",
+   "69ff5aae0ee5d8d5776450ec09e39cdcb912c374",
    "testharness"
   ],
   "trusted-types/HTMLMediaElement-src.tentative.html": [
-   "dc2d8beec67583a7821d445c0273be1c5754c33d",
+   "c24c19db7ed389820a5f6680597e6e7c76683f7b",
    "testharness"
   ],
   "trusted-types/HTMLSourceElement-src.tentative.html": [
-   "bc816aea73f1d1eaf7fbd7516360430483608fee",
+   "872f3b4930d931d56069adfd97afdb4eef5fb978",
    "testharness"
   ],
   "trusted-types/META.yml": [
    "4966e7a03e815dac333218faf57875b57b9dd535",
    "support"
   ],
   "trusted-types/TrustedHTML.tentative.html": [
-   "1bcbd6d4d990c00449a95fd9c410c199b83b6661",
+   "808ec9c374b847012bc1299aecfb9d87b2e8c19c",
    "testharness"
   ],
   "trusted-types/TrustedScriptURL.tentative.html": [
-   "2a02a26d6c55e38d51abebe59b470d6f5008440c",
+   "2f8d956c0179adc05fd92250fab500fcf21f6bba",
    "testharness"
   ],
   "trusted-types/TrustedURL.tentative.html": [
-   "e6cff885204af25c0233d9c18dd3de5cb82ed51b",
+   "2543ae30982c5d979502278f9edcd88d03090eba",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html": [
-   "1a3857314ef43c75bcf398f2429d34adce135edb",
+   "8f09389fb792f0fb24afd34035fa9cf055c05be6",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html": [
-   "29af914e035e196635be0568d8536f037c179c28",
+   "3f50eeada881f742a15be93140f6d274251290d4",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html": [
-   "9bb4f5866cff0c34d4d11a274008f322fa943920",
+   "4302f83ec84a7b505985cb2756ce75bf4150d600",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html": [
-   "1a403b7f4d9a0614e3fb7f41b95a0cf1e5fbb3ff",
+   "c3209381cb9dfafb16b2421b7536b225c3efd0a4",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-createContextualFragment.tentative.html": [
-   "aa2e78ed37b9b04378e0cbfc93a510bf428f6f78",
+   "9f2da1fdf1bf19b5bd86fb6526412655c3ccbfe6",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-embed-src.tentative.html": [
-   "1e598f550c120e3f1ae24dd36111da7d8863c7fd",
+   "67f647d655ac8c6716270ae1929f8fdb8919d8ed",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-innerHTML.tentative.html": [
-   "cde544697dbfa750e2f5ca8a1d7499d6c85c407e",
+   "ddbdee0f12a482599ec5913f78a527127a2aeb16",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html": [
-   "739b7940a27a298ca05005e9549774f9e0c0122f",
+   "3c43309acf17f8f2efe37113c662ef97d07aa0de",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-location-assign.tentative.html": [
-   "c50f889d7e517c42e8a490fcdc9e5e169b910876",
+   "189e70168a06390395863dc3c9d7609c11acf0a0",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-location-href.tentative.html": [
-   "b4da566f7eab26c9156e7976714618c74fd405b0",
+   "8c4f974ef05dac942dcdd811ea92fa6702ba8a40",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-location-replace.tentative.html": [
-   "2089fb7ca09b558d654d5e779a52f5acb61d4be8",
+   "e06b0b7233070f19f0d1b234d1ca8c023b98df1a",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-outerHTML.tentative.html": [
-   "a5301e971af8a918df577a3c00cf5d4be2b1d413",
+   "e45a6ea12e10693fb9c77e28e76e62a0c733d3da",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-script-src.tentative.html": [
-   "4a92a5485db5e199036f10322a89b713b9b02423",
+   "da38712c6e43d1e6fe5892a5339a45c4bf438c7e",
    "testharness"
   ],
   "trusted-types/createContextualFragment.tentative.html": [
-   "c806e71e06aa143840c7376960a44be6e6de77a8",
+   "e98f5e7fa6feeb5000a6310377ea82041c87e27d",
    "testharness"
   ],
   "trusted-types/document-write.tentative.html": [
-   "4eaf06e1d68d027a858ef6818aeac9b912164cbd",
+   "d4097e6235d0a8ddd28c9cfde4b985fb61e6ace9",
    "testharness"
   ],
   "trusted-types/embed-src.tentative.html": [
-   "402c569b64f260a4e0c4121a0eee76c59ed53737",
+   "0230cba4a277809feaedecd0ac17bb6bd6b99797",
    "testharness"
   ],
   "trusted-types/innerHTML.tentative.html": [
-   "d5797e778311a76860aab5ae1c1212ed6bf281b0",
+   "6c2492b545f0989ba74772ff8e0f3922f6ba70da",
    "testharness"
   ],
   "trusted-types/insertAdjacentHTML.tentative.html": [
-   "67298baa3acbfd88c9d867e60fc46ff8f9e2a2ca",
+   "fd95e2fa76d567311b8875bb7481d6345e5423c2",
    "testharness"
   ],
   "trusted-types/location-assign.tentative.html": [
-   "a13e8e471524a854a729ff6724bf7b818f278719",
+   "685f454d8f28c650b0714d1e35baaa3cfbd0b6c8",
    "testharness"
   ],
   "trusted-types/location-href.tentative.html": [
-   "b6b009db2b50ef1a456762256c598b907cbdce81",
+   "973d7da1fbcbfc5d1b75c5769ae9b53379340bba",
    "testharness"
   ],
   "trusted-types/location-replace.tentative.html": [
-   "a1aa171c4af1bab6e501504a0eb1ee9889e8ca26",
+   "07f2e2b7b6b4a1cbd9824bc9a3e575eeb99a3fe5",
    "testharness"
   ],
   "trusted-types/outerHTML.tentative.html": [
-   "959d23151fe6fa7f049fac11336da8ab9d962d0a",
+   "ad67e6c1be0b93e47b26c54544f3989d28588ece",
    "testharness"
   ],
   "trusted-types/script-src.tentative.html": [
-   "4a125530e91a3834077c658a9c0b550fcce8e626",
+   "bcebab27339a828c230ad518d1d71da3cd4cda98",
    "testharness"
   ],
   "trusted-types/srcDoc-requiresTrustedTypes.tentative.html": [
-   "d6691f250d64db32f34b1204ba769fa771712b02",
+   "7a7be9f8ed0bf2990f434a18169533a3a9df13ca",
    "testharness"
   ],
   "trusted-types/srcDoc.tentative.html": [
-   "1fc457290e2b9bd63acfb7eecd94c2f559ca558e",
-   "testharness"
-  ],
-  "trusted-types/support/helper.js": [
-   "6ea027fb1cee52a457e64f9b2b2c8294aa8a9dfc",
+   "c13a940e03f51dacfbed5036be81356ef4fe72e5",
+   "testharness"
+  ],
+  "trusted-types/support/helper.sub.js": [
+   "6162bad41b15d0ae0be727b5d960bb538d430fe2",
    "support"
   ],
   "uievents/META.yml": [
    "a6706289064c1bbabcfab6540831084fc39fb94a",
    "support"
   ],
   "uievents/README.md": [
    "bf426dc592940dbabd23db6c2343bcc5d29dc4b8",
--- a/testing/web-platform/tests/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
+++ b/testing/web-platform/tests/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
 <script>
   //HTML assignments don't throw
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
--- a/testing/web-platform/tests/trusted-types/DOMParser.tentative.html
+++ b/testing/web-platform/tests/trusted-types/DOMParser.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
     var parser = new DOMParser();
     var doc = parser.parseFromString(html, "text/html");
     assert_equals(doc.body.innerText, STRINGS.unescapedHTML);
--- a/testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
+++ b/testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <script>
     //helper function for the tests
     function testHref(str, url) {
       var base = document.createElement('base');
       base.href = url;
       assert_equals(base.href, str);
     }
--- a/testing/web-platform/tests/trusted-types/HTMLImageElement-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/HTMLImageElement-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 
 <body>
 <script>
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
     var d = document.createElement('image');
     d.src = url;
--- a/testing/web-platform/tests/trusted-types/HTMLMediaElement-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/HTMLMediaElement-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 
 <body>
 <script>
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
     var d = document.createElement('video');
     d.src = url;
--- a/testing/web-platform/tests/trusted-types/HTMLSourceElement-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/HTMLSourceElement-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
     var d = document.createElement('source');
     d.src = url;
     assert_equals(d.src, URLS.safe);
--- a/testing/web-platform/tests/trusted-types/TrustedHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/TrustedHTML.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <script>
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
     assert_equals(html.toString(), STRINGS.escapedHTML);
   }, "Basic escaping.");
 
   test(t => {
--- a/testing/web-platform/tests/trusted-types/TrustedScriptURL.tentative.html
+++ b/testing/web-platform/tests/trusted-types/TrustedScriptURL.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <script>
   test(t => {
     var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
 
     assert_equals(url.toString(), URLS.safe);
   }, "Basic processing: safe URL, unsafe construction.");
 
   test(t => {
--- a/testing/web-platform/tests/trusted-types/TrustedURL.tentative.html
+++ b/testing/web-platform/tests/trusted-types/TrustedURL.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <script>
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
     assert_equals(url.toString(), URLS.safe);
   }, "Basic processing: safe URL, safe construction.");
 
   test(t => {
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 
   <script>
     //helper function for the tests
     function testHref(str, url) {
       var base = document.createElement('base');
       base.href = url;
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
 <script>
   //URL assignments don't throw
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
 <script>
   //URL assignments don't throw
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
 <script>
   //URL assignments don't throw
   test(t => {
     var url = TrustedURL.create(URLS.safe);
 
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
 <script>
   //TrustedHTML assignments work
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
     var range = document.createRange();
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-embed-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-embed-src.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="./support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <script>
   // String assignments throw.
   test(t => {
     var s = document.createElement('embed');
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-innerHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-innerHTML.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <script>
   // String assignments throw.
   test(t => {
     var d = document.createElement('div');
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <div id="container"></div>
 <script>
   var container = document.querySelector('#container');
 
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-location-assign.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-location-assign.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <script>
   //TrustedURL assignments work
   test(t => {
     var url = TrustedURL.create(location.href + "#xxx");
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-location-href.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-location-href.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <script>
   // String assignments throw.
   promise_test(t => {
     return promise_rejects(t, new TypeError(), createFrameAndHref("about:blank"));
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-location-replace.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-location-replace.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <script>
   //TrustedURL replacements work
   test(t => {
     var url = TrustedURL.create(location.href + "#xxx");
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-outerHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-outerHTML.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <div id="container"></div>
 <script>
   var container = document.querySelector('#container')
 
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-script-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-script-src.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="./support/helper.js"></script>
+  <script src="support/helper.sub.js"></script>
 
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
 <body>
 <script>
   // String assignments throw.
   test(t => {
     var s = document.createElement('script');
--- a/testing/web-platform/tests/trusted-types/createContextualFragment.tentative.html
+++ b/testing/web-platform/tests/trusted-types/createContextualFragment.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
     var range = document.createRange();
     range.selectNodeContents(document.documentElement);
     var result = range.createContextualFragment(html);
--- a/testing/web-platform/tests/trusted-types/document-write.tentative.html
+++ b/testing/web-platform/tests/trusted-types/document-write.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   promise_test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
     return createFrameAndWrite(html).then(i => {
       assert_equals(i.contentDocument.body.innerText, STRINGS.unescapedHTML, "innerText");
       i.remove();
     });
--- a/testing/web-platform/tests/trusted-types/embed-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/embed-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
 
     var s = document.createElement('embed');
     s.src = url;
     assert_equals(url + '', s.src);
--- a/testing/web-platform/tests/trusted-types/innerHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/innerHTML.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
     var d = document.createElement('div');
     d.innerHTML = html;
     assert_equals(d.innerText, STRINGS.unescapedHTML);
--- a/testing/web-platform/tests/trusted-types/insertAdjacentHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/insertAdjacentHTML.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <div id="container"></div>
 <script>
   var container = document.querySelector('#container');
 
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
--- a/testing/web-platform/tests/trusted-types/location-assign.tentative.html
+++ b/testing/web-platform/tests/trusted-types/location-assign.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var url = TrustedURL.create(location.href + "#xxx");
     location.assign(url);
     assert_equals("" + url, location.href, "location href");
   }, "Basic processing: safe URL, safe construction.");
 
--- a/testing/web-platform/tests/trusted-types/location-href.tentative.html
+++ b/testing/web-platform/tests/trusted-types/location-href.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   promise_test(t => {
     var url = TrustedURL.create(URLS.safe);
     return createFrameAndHref(url);
   }, "Basic processing: safe URL, safe construction.");
 
   promise_test(t => {
--- a/testing/web-platform/tests/trusted-types/location-replace.tentative.html
+++ b/testing/web-platform/tests/trusted-types/location-replace.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var url = TrustedURL.create(location.href + "#xxx");
     location.replace(url);
     assert_equals("" + url, location.href, "location href");
   }, "Basic processing: safe URL, safe construction.");
 
--- a/testing/web-platform/tests/trusted-types/outerHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/outerHTML.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <div id="container"></div>
 <script>
   var container = document.querySelector('#container')
   test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
     var d = document.createElement('div');
--- a/testing/web-platform/tests/trusted-types/script-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/script-src.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   test(t => {
     var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
 
     var s = document.createElement('script');
     s.src = url;
     assert_equals(url + '', s.src);
--- a/testing/web-platform/tests/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
+++ b/testing/web-platform/tests/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
 <script>
   //HTML assignments don't throw
   async_test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
--- a/testing/web-platform/tests/trusted-types/srcDoc.tentative.html
+++ b/testing/web-platform/tests/trusted-types/srcDoc.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="support/helper.sub.js"></script>
 <body>
 <script>
   async_test(t => {
     var html = TrustedHTML.escape(STRINGS.unescapedHTML);
 
     var frame = document.createElement('iframe');
     frame.srcdoc = html;
     frame.onload = t.step_func_done(_ => {
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/support/helper.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var STRINGS = {
-  unescapedHTML: "<html>This has ', \", >, <, &amp; & characters!</html>",
-  escapedHTML: "&lt;html&gt;This has &#39;, &quot;, &gt;, &lt;, &amp;amp; &amp; characters!&lt;/html&gt;",
-  unescapedText: "This has ', \", >, <, & & characters!",
-};
-
-var URLS = {
-  safe: "https://example.test/",
-  javascript: "javascript:'scripted'",
-  external: "custom-handler:whatever",
-  sanitized: "about:invalid"
-};
-
-function createFrameAndWrite(html) {
-  return new Promise((resolve, reject) => {
-    var i = document.createElement('iframe');
-    i.onload = e => {
-      i.contentDocument.open();
-      try {
-        i.contentDocument.write(html);
-      } catch (e) {
-        i.remove();
-        reject(e);
-      }
-      i.contentDocument.close();
-      resolve(i);
-    };
-    document.body.appendChild(i);
-  });
-}
-
-function createFrameAndHref(href) {
-  return new Promise((resolve, reject) => {
-    var i = document.createElement('iframe');
-    i.onload = _ => {
-      i.onload = null;
-      try {
-        i.onload = _ => resolve(i);
-        i.contentWindow.location.href = href;
-      } catch (ex) {
-        i.remove();
-        reject(ex);
-      }
-    };
-    document.body.appendChild(i);
-  });
-}
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/trusted-types/support/helper.sub.js
@@ -0,0 +1,47 @@
+var STRINGS = {
+  unescapedHTML: "<html>This has ', \", >, <, &amp; & characters!</html>",
+  escapedHTML: "&lt;html&gt;This has &#39;, &quot;, &gt;, &lt;, &amp;amp; &amp; characters!&lt;/html&gt;",
+  unescapedText: "This has ', \", >, <, & & characters!",
+};
+
+var URLS = {
+  safe: "http://{{host}}:{{ports[http][0]}}/",
+  javascript: "javascript:'scripted'",
+  external: "custom-handler:whatever",
+  sanitized: "about:invalid"
+};
+
+function createFrameAndWrite(html) {
+  return new Promise((resolve, reject) => {
+    var i = document.createElement('iframe');
+    i.onload = e => {
+      i.contentDocument.open();
+      try {
+        i.contentDocument.write(html);
+      } catch (e) {
+        i.remove();
+        reject(e);
+      }
+      i.contentDocument.close();
+      resolve(i);
+    };
+    document.body.appendChild(i);
+  });
+}
+
+function createFrameAndHref(href) {
+  return new Promise((resolve, reject) => {
+    var i = document.createElement('iframe');
+    i.onload = _ => {
+      i.onload = null;
+      try {
+        i.onload = _ => resolve(i);
+        i.contentWindow.location.href = href;
+      } catch (ex) {
+        i.remove();
+        reject(ex);
+      }
+    };
+    document.body.appendChild(i);
+  });
+}