Bug 1476808 [wpt PR 12058] - Revert "Adjusted references in tests to match new helper.sub.js file", a=testonly

Automatic update from web-platform-testsRevert "Adjusted references in tests to match new helper.sub.js file" This reverts commit ac436aaa9d361c99dcf4df11bd11ad201a2bccd8. Reason for revert: Sorry for the revert, but this might be breaking some layout tests on https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20Tests/71090 (see also a few subsequent builds) Failing tests include: external/wpt/trusted-types/HTMLImageElement-src.tentative.html external/wpt/trusted-types/HTMLMediaElement-src.tentative.html external/wpt/trusted-types/HTMLSourceElement-src.tentative.html external/wpt/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html external/wpt/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html external/wpt/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html Sample failure output (from external/wpt/trusted-types/HTMLImageElement-src.tentative.html, others are similar): This is a testharness.js-based test. FAIL src = TrustedURL.create(). URLS is not defined FAIL src = TrustedURL.unsafelyCreate(). URLS is not defined Harness: the test ran to completion. 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} TBR=vogelheim@chromium.org,mkwst@chromium.org,kabusm@google.com Change-Id: Ieaa3bba36a970c7aa7547939c8f97a57a1b32544 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 739170 Reviewed-on: https://chromium-review.googlesource.com/1142165 Reviewed-by: Alex Moshchuk <alexmos@chromium.org> Commit-Queue: Alex Moshchuk <alexmos@chromium.org> Cr-Commit-Position: refs/heads/master@{#576103} -- wpt-commits: 70afecf33059eab74cd92d97822386955e905a10 wpt-pr: 12058
2018-07-25 17:41:12 +00:00 · 2018-07-25 17:41:12 +00:00 · 35c6876309
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@ -297003,7 +297003,7 @@
     {}
    ]
   ],
-   "trusted-types/support/helper.sub.js": [
+   "trusted-types/support/helper.js": [
    [
     {}
    ]
@ -620688,15 +620688,15 @@
   "testharness"
  ],
  "trusted-types/DOMParser-requiresTrustedTypes.tentative.html": [
-   "f9b9110f3620949c26b9ae047730b2def936a812",
+   "0846d9c9f9c97063915cee559bcf4a3e711e9887",
   "testharness"
  ],
  "trusted-types/DOMParser.tentative.html": [
-   "95e12b63536c98404993ddf9b6b90e248f56db31",
+   "a32d31137bcfc113ce1ca9f75c9770d3501364d5",
   "testharness"
  ],
  "trusted-types/HTMLBaseElement-href.tentative.html": [
-   "bdc6593b4490bd0a1b22ef423c7fc95468acd7e5",
+   "5b387ae813ec359650618081128001955c7024e2",
   "testharness"
  ],
  "trusted-types/HTMLImageElement-src.tentative.html": [
@ -620716,19 +620716,19 @@
   "support"
  ],
  "trusted-types/TrustedHTML.tentative.html": [
-   "808ec9c374b847012bc1299aecfb9d87b2e8c19c",
+   "1bcbd6d4d990c00449a95fd9c410c199b83b6661",
   "testharness"
  ],
  "trusted-types/TrustedScriptURL.tentative.html": [
-   "2f8d956c0179adc05fd92250fab500fcf21f6bba",
+   "2a02a26d6c55e38d51abebe59b470d6f5008440c",
   "testharness"
  ],
  "trusted-types/TrustedURL.tentative.html": [
-   "2543ae30982c5d979502278f9edcd88d03090eba",
+   "e6cff885204af25c0233d9c18dd3de5cb82ed51b",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html": [
-   "8f09389fb792f0fb24afd34035fa9cf055c05be6",
+   "1a3857314ef43c75bcf398f2429d34adce135edb",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html": [
@ -620744,7 +620744,7 @@
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-createContextualFragment.tentative.html": [
-   "9f2da1fdf1bf19b5bd86fb6526412655c3ccbfe6",
+   "aa2e78ed37b9b04378e0cbfc93a510bf428f6f78",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-embed-src.tentative.html": [
@ -620752,39 +620752,39 @@
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-innerHTML.tentative.html": [
-   "ddbdee0f12a482599ec5913f78a527127a2aeb16",
+   "cde544697dbfa750e2f5ca8a1d7499d6c85c407e",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html": [
-   "3c43309acf17f8f2efe37113c662ef97d07aa0de",
+   "739b7940a27a298ca05005e9549774f9e0c0122f",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-location-assign.tentative.html": [
-   "189e70168a06390395863dc3c9d7609c11acf0a0",
+   "c50f889d7e517c42e8a490fcdc9e5e169b910876",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-location-href.tentative.html": [
-   "8c4f974ef05dac942dcdd811ea92fa6702ba8a40",
+   "b4da566f7eab26c9156e7976714618c74fd405b0",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-location-replace.tentative.html": [
-   "e06b0b7233070f19f0d1b234d1ca8c023b98df1a",
+   "2089fb7ca09b558d654d5e779a52f5acb61d4be8",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-outerHTML.tentative.html": [
-   "e45a6ea12e10693fb9c77e28e76e62a0c733d3da",
+   "a5301e971af8a918df577a3c00cf5d4be2b1d413",
   "testharness"
  ],
  "trusted-types/block-string-assignment-to-script-src.tentative.html": [
-   "da38712c6e43d1e6fe5892a5339a45c4bf438c7e",
+   "4a92a5485db5e199036f10322a89b713b9b02423",
   "testharness"
  ],
  "trusted-types/createContextualFragment.tentative.html": [
-   "e98f5e7fa6feeb5000a6310377ea82041c87e27d",
+   "c806e71e06aa143840c7376960a44be6e6de77a8",
   "testharness"
  ],
  "trusted-types/document-write.tentative.html": [
-   "d4097e6235d0a8ddd28c9cfde4b985fb61e6ace9",
+   "4eaf06e1d68d027a858ef6818aeac9b912164cbd",
   "testharness"
  ],
  "trusted-types/embed-src.tentative.html": [
@ -620792,43 +620792,43 @@
   "testharness"
  ],
  "trusted-types/innerHTML.tentative.html": [
-   "6c2492b545f0989ba74772ff8e0f3922f6ba70da",
+   "d5797e778311a76860aab5ae1c1212ed6bf281b0",
   "testharness"
  ],
  "trusted-types/insertAdjacentHTML.tentative.html": [
-   "fd95e2fa76d567311b8875bb7481d6345e5423c2",
+   "67298baa3acbfd88c9d867e60fc46ff8f9e2a2ca",
   "testharness"
  ],
  "trusted-types/location-assign.tentative.html": [
-   "685f454d8f28c650b0714d1e35baaa3cfbd0b6c8",
+   "a13e8e471524a854a729ff6724bf7b818f278719",
   "testharness"
  ],
  "trusted-types/location-href.tentative.html": [
-   "973d7da1fbcbfc5d1b75c5769ae9b53379340bba",
+   "b6b009db2b50ef1a456762256c598b907cbdce81",
   "testharness"
  ],
  "trusted-types/location-replace.tentative.html": [
-   "07f2e2b7b6b4a1cbd9824bc9a3e575eeb99a3fe5",
+   "a1aa171c4af1bab6e501504a0eb1ee9889e8ca26",
   "testharness"
  ],
  "trusted-types/outerHTML.tentative.html": [
-   "ad67e6c1be0b93e47b26c54544f3989d28588ece",
+   "959d23151fe6fa7f049fac11336da8ab9d962d0a",
   "testharness"
  ],
  "trusted-types/script-src.tentative.html": [
-   "bcebab27339a828c230ad518d1d71da3cd4cda98",
+   "4a125530e91a3834077c658a9c0b550fcce8e626",
   "testharness"
  ],
  "trusted-types/srcDoc-requiresTrustedTypes.tentative.html": [
-   "7a7be9f8ed0bf2990f434a18169533a3a9df13ca",
+   "d6691f250d64db32f34b1204ba769fa771712b02",
   "testharness"
  ],
  "trusted-types/srcDoc.tentative.html": [
-   "c13a940e03f51dacfbed5036be81356ef4fe72e5",
+   "1fc457290e2b9bd63acfb7eecd94c2f559ca558e",
   "testharness"
  ],
-  "trusted-types/support/helper.sub.js": [
-   "6162bad41b15d0ae0be727b5d960bb538d430fe2",
+  "trusted-types/support/helper.js": [
+   "6ea027fb1cee52a457e64f9b2b2c8294aa8a9dfc",
   "support"
  ],
  "uievents/META.yml": [
--- a/testing/web-platform/tests/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
+++ b/testing/web-platform/tests/trusted-types/DOMParser-requiresTrustedTypes.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>

 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
--- a/testing/web-platform/tests/trusted-types/DOMParser.tentative.html
+++ b/testing/web-platform/tests/trusted-types/DOMParser.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  test(t => {
--- a/testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
+++ b/testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="support/helper.js"></script>

  <script>
    //helper function for the tests
--- a/testing/web-platform/tests/trusted-types/TrustedHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/TrustedHTML.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <script>
  test(t => {
    var html = TrustedHTML.escape(STRINGS.unescapedHTML);
--- a/testing/web-platform/tests/trusted-types/TrustedScriptURL.tentative.html
+++ b/testing/web-platform/tests/trusted-types/TrustedScriptURL.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <script>
  test(t => {
    var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
--- a/testing/web-platform/tests/trusted-types/TrustedURL.tentative.html
+++ b/testing/web-platform/tests/trusted-types/TrustedURL.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <script>
  test(t => {
    var url = TrustedURL.create(URLS.safe);
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">

--- 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,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="support/helper.js"></script>

 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- 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
@ -3,7 +3,7 @@
 <head>
  <script src="/resources/testharness.js"></script>
  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
+  <script src="./support/helper.js"></script>

  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 </head>
--- a/testing/web-platform/tests/trusted-types/createContextualFragment.tentative.html
+++ b/testing/web-platform/tests/trusted-types/createContextualFragment.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  test(t => {
--- a/testing/web-platform/tests/trusted-types/document-write.tentative.html
+++ b/testing/web-platform/tests/trusted-types/document-write.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  promise_test(t => {
--- a/testing/web-platform/tests/trusted-types/innerHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/innerHTML.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  test(t => {
--- a/testing/web-platform/tests/trusted-types/insertAdjacentHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/insertAdjacentHTML.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <div id="container"></div>
 <script>
--- a/testing/web-platform/tests/trusted-types/location-assign.tentative.html
+++ b/testing/web-platform/tests/trusted-types/location-assign.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="support/helper.js"></script>
 <body>
 <script>
  test(t => {
--- a/testing/web-platform/tests/trusted-types/location-href.tentative.html
+++ b/testing/web-platform/tests/trusted-types/location-href.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  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,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="support/helper.js"></script>
 <body>
 <script>
  test(t => {
--- a/testing/web-platform/tests/trusted-types/outerHTML.tentative.html
+++ b/testing/web-platform/tests/trusted-types/outerHTML.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <div id="container"></div>
 <script>
--- a/testing/web-platform/tests/trusted-types/script-src.tentative.html
+++ b/testing/web-platform/tests/trusted-types/script-src.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  test(t => {
--- a/testing/web-platform/tests/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
+++ b/testing/web-platform/tests/trusted-types/srcDoc-requiresTrustedTypes.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>

 <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
 <body>
--- a/testing/web-platform/tests/trusted-types/srcDoc.tentative.html
+++ b/testing/web-platform/tests/trusted-types/srcDoc.tentative.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
+<script src="./support/helper.js"></script>
 <body>
 <script>
  async_test(t => {
--- a/testing/web-platform/tests/trusted-types/support/helper.sub.js
+++ b/testing/web-platform/tests/trusted-types/support/helper.sub.js
@ -5,7 +5,7 @@ var STRINGS = {
 };

 var URLS = {
-  safe: "http://{{host}}:{{ports[http][0]}}/",
+  safe: "https://example.test/",
  javascript: "javascript:'scripted'",
  external: "custom-handler:whatever",
  sanitized: "about:invalid"