Bug 1477637 [wpt PR 12140] - Replaced HTML*Element tests with two generic test files, a=testonly
authorMaja Kabus <kabusm@google.com>
Wed, 15 Aug 2018 09:58:14 +0000
changeset 486843 c7cbb4da979b65483a9b153faff2c09f27dae006
parent 486842 9ee4484da82cd63bb88e713a2d97570b6f33eaac
child 486844 2052cd073fc2b0208d9d791fd08edb9563cf6fb7
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1477637, 12140, 739170, 1146567, 582550
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 1477637 [wpt PR 12140] - Replaced HTML*Element tests with two generic test files, a=testonly Automatic update from web-platform-testsReplaced HTML*Element tests with two generic test files HTML*Element href and src test files merged into two HTMLElement-generic test files. Bug: 739170 Change-Id: I3cf49c9d72540c7f51439fb157f1d201048a349e Reviewed-on: https://chromium-review.googlesource.com/1146567 Commit-Queue: Mike West <mkwst@chromium.org> Reviewed-by: Mike West <mkwst@chromium.org> Cr-Commit-Position: refs/heads/master@{#582550} -- wpt-commits: af5652d49d6e52dcb26dd5dd07e60a57fcc60de1 wpt-pr: 12140
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/trusted-types/HTMLAnchorElement-href.tentative.html
testing/web-platform/tests/trusted-types/HTMLAreaElement-href.tentative.html
testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
testing/web-platform/tests/trusted-types/HTMLElement-generic.tentative.html
testing/web-platform/tests/trusted-types/HTMLIFrameElement-src.tentative.html
testing/web-platform/tests/trusted-types/HTMLImageElement-src.tentative.html
testing/web-platform/tests/trusted-types/HTMLLinkElement-href.tentative.html
testing/web-platform/tests/trusted-types/HTMLMediaElement-src.tentative.html
testing/web-platform/tests/trusted-types/HTMLObjectElement.tentative.html
testing/web-platform/tests/trusted-types/HTMLSourceElement-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLAnchorElement-href.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLAreaElement-href.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-HTMLElement-generic.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLIFrameElement-src.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-HTMLLinkElement-href.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-HTMLObjectElement.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-embed-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-frame-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-input-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-script-src.tentative.html
testing/web-platform/tests/trusted-types/block-string-assignment-to-track-src.tentative.html
testing/web-platform/tests/trusted-types/embed-src.tentative.html
testing/web-platform/tests/trusted-types/frame-src.tentative.html
testing/web-platform/tests/trusted-types/input-src.tentative.html
testing/web-platform/tests/trusted-types/script-src.tentative.html
testing/web-platform/tests/trusted-types/support/helper.sub.js
testing/web-platform/tests/trusted-types/track-src.tentative.html
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -392130,67 +392130,19 @@
     ]
    ],
    "trusted-types/DOMParser.tentative.html": [
     [
      "/trusted-types/DOMParser.tentative.html",
      {}
     ]
    ],
-   "trusted-types/HTMLAnchorElement-href.tentative.html": [
-    [
-     "/trusted-types/HTMLAnchorElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLAreaElement-href.tentative.html": [
-    [
-     "/trusted-types/HTMLAreaElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLBaseElement-href.tentative.html": [
-    [
-     "/trusted-types/HTMLBaseElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLIFrameElement-src.tentative.html": [
-    [
-     "/trusted-types/HTMLIFrameElement-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLImageElement-src.tentative.html": [
-    [
-     "/trusted-types/HTMLImageElement-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLLinkElement-href.tentative.html": [
-    [
-     "/trusted-types/HTMLLinkElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLMediaElement-src.tentative.html": [
-    [
-     "/trusted-types/HTMLMediaElement-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLObjectElement.tentative.html": [
-    [
-     "/trusted-types/HTMLObjectElement.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/HTMLSourceElement-src.tentative.html": [
-    [
-     "/trusted-types/HTMLSourceElement-src.tentative.html",
+   "trusted-types/HTMLElement-generic.tentative.html": [
+    [
+     "/trusted-types/HTMLElement-generic.tentative.html",
      {}
     ]
    ],
    "trusted-types/TrustedHTML.tentative.html": [
     [
      "/trusted-types/TrustedHTML.tentative.html",
      {}
     ]
@@ -392214,100 +392166,34 @@
     ]
    ],
    "trusted-types/Window-trustedTypes.tentative.html": [
     [
      "/trusted-types/Window-trustedTypes.tentative.html",
      {}
     ]
    ],
-   "trusted-types/block-string-assignment-to-HTMLAnchorElement-href.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLAnchorElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLAreaElement-href.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLAreaElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLIFrameElement-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLIFrameElement-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLLinkElement-href.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLLinkElement-href.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLObjectElement.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLObjectElement.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html",
+   "trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html": [
+    [
+     "/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html",
      {}
     ]
    ],
    "trusted-types/block-string-assignment-to-createContextualFragment.tentative.html": [
     [
      "/trusted-types/block-string-assignment-to-createContextualFragment.tentative.html",
      {}
     ]
    ],
-   "trusted-types/block-string-assignment-to-embed-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-embed-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-frame-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-frame-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/block-string-assignment-to-innerHTML.tentative.html": [
     [
      "/trusted-types/block-string-assignment-to-innerHTML.tentative.html",
      {}
     ]
    ],
-   "trusted-types/block-string-assignment-to-input-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-input-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html": [
     [
      "/trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html",
      {}
     ]
    ],
    "trusted-types/block-string-assignment-to-location-assign.tentative.html": [
     [
@@ -392328,28 +392214,16 @@
     ]
    ],
    "trusted-types/block-string-assignment-to-outerHTML.tentative.html": [
     [
      "/trusted-types/block-string-assignment-to-outerHTML.tentative.html",
      {}
     ]
    ],
-   "trusted-types/block-string-assignment-to-script-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-script-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/block-string-assignment-to-track-src.tentative.html": [
-    [
-     "/trusted-types/block-string-assignment-to-track-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/block-string-assignment-to-window-open.tentative.html": [
     [
      "/trusted-types/block-string-assignment-to-window-open.tentative.html",
      {}
     ]
    ],
    "trusted-types/createContextualFragment.tentative.html": [
     [
@@ -392358,40 +392232,22 @@
     ]
    ],
    "trusted-types/document-write.tentative.html": [
     [
      "/trusted-types/document-write.tentative.html",
      {}
     ]
    ],
-   "trusted-types/embed-src.tentative.html": [
-    [
-     "/trusted-types/embed-src.tentative.html",
-     {}
-    ]
-   ],
-   "trusted-types/frame-src.tentative.html": [
-    [
-     "/trusted-types/frame-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/innerHTML.tentative.html": [
     [
      "/trusted-types/innerHTML.tentative.html",
      {}
     ]
    ],
-   "trusted-types/input-src.tentative.html": [
-    [
-     "/trusted-types/input-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/insertAdjacentHTML.tentative.html": [
     [
      "/trusted-types/insertAdjacentHTML.tentative.html",
      {}
     ]
    ],
    "trusted-types/location-assign.tentative.html": [
     [
@@ -392412,40 +392268,28 @@
     ]
    ],
    "trusted-types/outerHTML.tentative.html": [
     [
      "/trusted-types/outerHTML.tentative.html",
      {}
     ]
    ],
-   "trusted-types/script-src.tentative.html": [
-    [
-     "/trusted-types/script-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/srcDoc-requiresTrustedTypes.tentative.html": [
     [
      "/trusted-types/srcDoc-requiresTrustedTypes.tentative.html",
      {}
     ]
    ],
    "trusted-types/srcDoc.tentative.html": [
     [
      "/trusted-types/srcDoc.tentative.html",
      {}
     ]
    ],
-   "trusted-types/track-src.tentative.html": [
-    [
-     "/trusted-types/track-src.tentative.html",
-     {}
-    ]
-   ],
    "trusted-types/window-open.tentative.html": [
     [
      "/trusted-types/window-open.tentative.html",
      {}
     ]
    ],
    "uievents/constructors/inputevent-constructor.html": [
     [
@@ -642481,50 +642325,18 @@
   "trusted-types/DOMParser-requiresTrustedTypes.tentative.html": [
    "7e21feabd24c653cbe0b713d01e20aeade534b6e",
    "testharness"
   ],
   "trusted-types/DOMParser.tentative.html": [
    "53d2b44febd6510b4216bb21cb22a83ed6663e5b",
    "testharness"
   ],
-  "trusted-types/HTMLAnchorElement-href.tentative.html": [
-   "33c8989642a5a6e1ae3482cdaff2a39a402e40f8",
-   "testharness"
-  ],
-  "trusted-types/HTMLAreaElement-href.tentative.html": [
-   "8ac509d34b21a2a396cbd3dbcf7859b06fbd7f0a",
-   "testharness"
-  ],
-  "trusted-types/HTMLBaseElement-href.tentative.html": [
-   "80bed8079818047917b72b12d2d108ca51510e57",
-   "testharness"
-  ],
-  "trusted-types/HTMLIFrameElement-src.tentative.html": [
-   "6e89a0f397e4014550ae16842199bfc62c4125d5",
-   "testharness"
-  ],
-  "trusted-types/HTMLImageElement-src.tentative.html": [
-   "5797aa5079e6fb3f3e4e7a83af524b6b2ef6a013",
-   "testharness"
-  ],
-  "trusted-types/HTMLLinkElement-href.tentative.html": [
-   "7f6e7e23e872026346c952fb3a3cbd1708a18397",
-   "testharness"
-  ],
-  "trusted-types/HTMLMediaElement-src.tentative.html": [
-   "c54dfddd8278853ca73b696ab05d05ac7e03a458",
-   "testharness"
-  ],
-  "trusted-types/HTMLObjectElement.tentative.html": [
-   "a9dcc94a43ba2cc96a960057dbdeab89a093bc1a",
-   "testharness"
-  ],
-  "trusted-types/HTMLSourceElement-src.tentative.html": [
-   "6791a0fc118be18ae997806c347177246c05e147",
+  "trusted-types/HTMLElement-generic.tentative.html": [
+   "486b008986bc4e3328c8b709674359538d408800",
    "testharness"
   ],
   "trusted-types/META.yml": [
    "d0743949b6a122d8bd0adf7b1ed0181f0c51429d",
    "support"
   ],
   "trusted-types/TrustedHTML.tentative.html": [
    "a8d4e78b06d124b05aa640aad563b3d9e9003046",
@@ -642541,72 +642353,28 @@
   "trusted-types/TrustedURL.tentative.html": [
    "5048326fad81af68915b9f83b56da375388fcbef",
    "testharness"
   ],
   "trusted-types/Window-trustedTypes.tentative.html": [
    "ef4487749dd0c12a00bd3ab42c1353467a6eeb8f",
    "testharness"
   ],
-  "trusted-types/block-string-assignment-to-HTMLAnchorElement-href.tentative.html": [
-   "53334e2e810bb27900908ccdf71105c0a687f016",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLAreaElement-href.tentative.html": [
-   "5879d1c330e3b7503de80a8f7b0bb61b34b2cf41",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html": [
-   "a973e29f2758034fac4b6c788f5ed6fe82ccb5d6",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLIFrameElement-src.tentative.html": [
-   "8db0d60cdeb92f7ec456a1126c1a88175a002590",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html": [
-   "44461067a3f13c9a9973761bfd036e74b2dda96c",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLLinkElement-href.tentative.html": [
-   "11950da775ee8917c0fa7d2b6c6090d748e27001",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html": [
-   "38ac53f2027ee3b5289f3569d76ca30def09fbcb",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLObjectElement.tentative.html": [
-   "87e1f46464f7a6b08cc84344638ddc98714e2f0a",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html": [
-   "37ab90cd700fa6bb766ebc185d9bb5e6c4734428",
+  "trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html": [
+   "79bbb24f541b43123ef1d5f814fb3108275b974c",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-createContextualFragment.tentative.html": [
    "1d67a51ff6ab1df879a59af5ee7c6ad9a0609be0",
    "testharness"
   ],
-  "trusted-types/block-string-assignment-to-embed-src.tentative.html": [
-   "005dfe20be62cb72fefed836fc6d809e3dd118bc",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-frame-src.tentative.html": [
-   "c915e430a6d29c855663812fa453212f16268aa9",
-   "testharness"
-  ],
   "trusted-types/block-string-assignment-to-innerHTML.tentative.html": [
    "67faf6ea7d30ebb76bb857faf0faf04743917dfb",
    "testharness"
   ],
-  "trusted-types/block-string-assignment-to-input-src.tentative.html": [
-   "732ebe80d62ef8442b47b0789d045944f8410238",
-   "testharness"
-  ],
   "trusted-types/block-string-assignment-to-insertAdjacentHTML.tentative.html": [
    "70bb803442f14cbdcb356be6f6cdceca83522008",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-location-assign.tentative.html": [
    "76725da7c72e2f137b15c065bf74a43fc95c1933",
    "testharness"
   ],
@@ -642617,52 +642385,32 @@
   "trusted-types/block-string-assignment-to-location-replace.tentative.html": [
    "9736a84b3ada709ac7ea758ccca10b766130b9aa",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-outerHTML.tentative.html": [
    "8cf6c4b065a87f83015e5519ce86ecb6e1115e12",
    "testharness"
   ],
-  "trusted-types/block-string-assignment-to-script-src.tentative.html": [
-   "ade76848209bebc46cc8eb4c011012742f385581",
-   "testharness"
-  ],
-  "trusted-types/block-string-assignment-to-track-src.tentative.html": [
-   "b6f81e9d0e4576ed6dc0781164a6adacce6d5318",
-   "testharness"
-  ],
   "trusted-types/block-string-assignment-to-window-open.tentative.html": [
    "2c3a8ce056685a5306472ee2e1a87bcbfc4c11e9",
    "testharness"
   ],
   "trusted-types/createContextualFragment.tentative.html": [
    "5e50acc80650e4cc66e045735b301df3cdcaa307",
    "testharness"
   ],
   "trusted-types/document-write.tentative.html": [
    "12794199722f6e2f078efa9ce9f91146c8ae9219",
    "testharness"
   ],
-  "trusted-types/embed-src.tentative.html": [
-   "75760278fac4dc4e1dff94dd727f3c105dd8ae00",
-   "testharness"
-  ],
-  "trusted-types/frame-src.tentative.html": [
-   "31a1ce919c24c063aeffe12a6a20cb4d9181e7d9",
-   "testharness"
-  ],
   "trusted-types/innerHTML.tentative.html": [
    "f9f32d42a766346f5fd4e5fd18d8e20f7acba810",
    "testharness"
   ],
-  "trusted-types/input-src.tentative.html": [
-   "8cbd0ad41721974bfaf8d2d4cf0ee88fa7272d02",
-   "testharness"
-  ],
   "trusted-types/insertAdjacentHTML.tentative.html": [
    "a95dd6c0bacc9844d25e64453b66aab759c76ad7",
    "testharness"
   ],
   "trusted-types/location-assign.tentative.html": [
    "07cb4a801966006065adca4a5635d798c5c8ef94",
    "testharness"
   ],
@@ -642673,35 +642421,27 @@
   "trusted-types/location-replace.tentative.html": [
    "097c24d593aa1eb34d452dd1d2812f2cc72ae1ad",
    "testharness"
   ],
   "trusted-types/outerHTML.tentative.html": [
    "1deb46bf5e3d102550575d5e79eaf05cdf9739f6",
    "testharness"
   ],
-  "trusted-types/script-src.tentative.html": [
-   "7235cc3bca650db268a6bc1b85ca47ae1c80d352",
-   "testharness"
-  ],
   "trusted-types/srcDoc-requiresTrustedTypes.tentative.html": [
    "b957488bee42d17b3160144b1cdaccfdfb8f1689",
    "testharness"
   ],
   "trusted-types/srcDoc.tentative.html": [
    "b23703e22329a088b9459bdbbda367b5debf184f",
    "testharness"
   ],
   "trusted-types/support/helper.sub.js": [
-   "036dbed7d1593f2ffe05d1fac4e00603b0ce6a37",
-   "support"
-  ],
-  "trusted-types/track-src.tentative.html": [
-   "cfe5374e41c56606c8499f32af8e87d0510bf50c",
-   "testharness"
+   "91112d8f239069a9f88fdcffc46f5b2d49e49321",
+   "support"
   ],
   "trusted-types/window-open.tentative.html": [
    "66ffbd78399c70cca883ac55b6f380587bffc9ab",
    "testharness"
   ],
   "uievents/META.yml": [
    "2f1ec58efec10e0dd6374aac05cb926c8cffa3f1",
    "support"
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLAnchorElement-href.tentative.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
-<body>
-<script>
-  //helper function for the tests
-  function testHref(str, url) {
-    var a = document.createElement('a');
-    a.href = url;
-    assert_equals(a.href, str);
-  }
-
-  test(t => {
-    testHref(URLS.safe, TrustedURL.create(URLS.safe));
-  }, "a.href = URLS.safe, TrustedURL.create");
-
-  test(t => {
-    testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-  }, "a.href = URLS.safe, TrustedURL.unsafelyCreate");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLAreaElement-href.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
-<body>
-  <map>
-    <script>
-    //helper function for the tests
-    function testHref(str, url) {
-      var area = document.createElement('area');
-      area.href = url;
-      area.alt = "Area";
-      assert_equals(area.href, str);
-    }
-
-    test(t => {
-      testHref(URLS.safe, TrustedURL.create(URLS.safe));
-    }, "area.href = URLS.safe, TrustedURL.create");
-
-    test(t => {
-      testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-    }, "area.href = URLS.safe, TrustedURL.unsafelyCreate");
-    </script>
-  </map>
-</body>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLBaseElement-href.tentative.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.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);
-    }
-
-    test(t => {
-      testHref(URLS.safe, TrustedURL.create(URLS.safe));
-    }, "base.href = URLS.safe, TrustedURL.create");
-
-    test(t => {
-      testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-    }, "base.href = URLS.safe, TrustedURL.unsafelyCreate");
-  </script>
-</head>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/trusted-types/HTMLElement-generic.tentative.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/helper.sub.js"></script>
+</head>
+<body>
+<script>
+  //TrustedURL Assignments
+  let testCases = [
+    [ 'a', 'href' ],
+    [ 'area', 'href' ],
+    [ 'base', 'href' ],
+    [ 'frame', 'src' ],
+    [ 'iframe', 'src' ],
+    [ 'img', 'src' ],
+    [ 'input', 'src' ],
+    [ 'link', 'href' ],
+    [ 'video', 'src' ],
+    [ 'object', 'data' ],
+    [ 'object', 'codeBase' ],
+    [ 'source', 'src' ],
+    [ 'track', 'src' ]
+  ];
+
+  testCases.forEach(c => {
+    test(t => {
+      assert_accepts_trusted_url(c[0], c[1]);
+    }, c[0] + "." + c[1] + " accepts TrustedURL");
+  });
+
+  //TrustedScriptURL Assignments
+  let scriptTestCases = [
+    [ 'embed', 'src' ],
+    [ 'script', 'src' ]
+  ];
+
+  scriptTestCases.forEach(c => {
+    test(t => {
+      assert_accepts_trusted_script_url(c[0], c[1]);
+    }, c[0] + "." + c[1] + " accepts TrustedScriptURL");
+  });
+</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLIFrameElement-src.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.sub.js"></script>
-
-<body>
-<script>
-  test(t => {
-    var url = TrustedURL.create(URLS.safe);
-
-    var d = document.createElement('iframe');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('iframe');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLImageElement-src.tentative.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('image');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>
-
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLLinkElement-href.tentative.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
-<body>
-<script>
-  //helper function for the tests
-  function testHref(str, url) {
-    var link = document.createElement('link');
-    link.href = url;
-    assert_equals(link.href, str);
-  }
-
-  test(t => {
-    testHref(URLS.safe, TrustedURL.create(URLS.safe));
-  }, "link.href = URLS.safe, TrustedURL.create");
-
-  test(t => {
-    testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-  }, "link.href = URLS.safe, TrustedURL.unsafelyCreate");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLMediaElement-src.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('video');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLObjectElement.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support/helper.sub.js"></script>
-<body>
-<script>
-  //helper function for the tests
-  function testData(str, url) {
-    var objectElement = document.createElement('object');
-    objectElement.data = url;
-    objectElement.codeBase = url;
-    assert_equals(objectElement.data, str);
-    assert_equals(objectElement.codeBase,str);
-  }
-
-  test(t => {
-    testData(URLS.safe, TrustedURL.create(URLS.safe));
-  }, "Basic processing: safe URL, safe construction.");
-
-  test(t => {
-    testData(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-  }, "Basic processing: safe URL, unsafe construction.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/HTMLSourceElement-src.tentative.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('source');
-    d.src = url;
-    assert_equals(d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLAnchorElement-href.tentative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
-
-  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
-</head>
-<body>
-<script>
-  //helper function for the tests
-  function testHref(str, url) {
-    var a = document.createElement('a');
-    a.href = url;
-    assert_equals(a.href, str);
-  }
-
-  //URL assignments do not throw.
-  test(t => {
-    testHref(URLS.safe, TrustedURL.create(URLS.safe));
-  }, "a.href = URLS.safe, TrustedURL.create");
-
-  test(t => {
-    testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-  }, "a.href = URLS.safe, TrustedURL.unsafelyCreate");
-
-  // String assignments throw.
-  test(t => {
-    var a = document.createElement('a');
-    assert_throws(new TypeError(), _ => {
-      a.href = "A string";
-    });
-  }, "`a.href = string` throws");
-
-  //Null assignment throws.
-  test(t => {
-    var a = document.createElement('a');
-    assert_throws(new TypeError(), _ => {
-      a.href = null;
-    });
-  }, "`a.href = null` throws");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLAreaElement-href.tentative.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
-
-  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
-</head>
-<body>
-  <map>
-    <script>
-    //helper function for the tests
-    function testHref(str, url) {
-      var area = document.createElement('area');
-      area.href = url;
-      area.alt = "Area";
-      assert_equals(area.href, str);
-    }
-
-    //URL assignments do not throw.
-    test(t => {
-      testHref(URLS.safe, TrustedURL.create(URLS.safe));
-    }, "area.href = URLS.safe, TrustedURL.create");
-
-    test(t => {
-      testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-    }, "area.href = URLS.safe, TrustedURL.unsafelyCreate");
-
-    // String assignments throw.
-    test(t => {
-      var area = document.createElement('area');
-      assert_throws(new TypeError(), _ => {
-        area.href = "A string";
-      });
-    }, "`area.href = string` throws");
-
-    //Null assignment throws.
-    test(t => {
-      var area = document.createElement('area');
-      assert_throws(new TypeError(), _ => {
-        area.href = null;
-      });
-    }, "`area.href = null` throws");
-    </script>
-  </map>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLBaseElement-href.tentative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.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;
-      assert_equals(base.href, str);
-    }
-
-    //URL assignments do not throw.
-    test(t => {
-      testHref(URLS.safe, TrustedURL.create(URLS.safe));
-    }, "base.href = URLS.safe, TrustedURL.create");
-
-    test(t => {
-      testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-    }, "base.href = URLS.safe, TrustedURL.unsafelyCreate");
-
-    // String assignments throw.
-    test(t => {
-      var base = document.createElement('base');
-      assert_throws(new TypeError(), _ => {
-        base.href = "A string";
-      });
-    }, "`base.href = string` throws");
-
-    //Null assignment throws.
-    test(t => {
-      var base = document.createElement('base');
-      assert_throws(new TypeError(), _ => {
-        base.href = null;
-      });
-    }, "`base.href = null` throws");
-  </script>
-</head>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/helper.sub.js"></script>
+
+  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
+</head>
+<body>
+<script>
+  //TrustedURL Assignments
+  let testCases = [
+    [ 'a', 'href' ],
+    [ 'area', 'href' ],
+    [ 'base', 'href' ],
+    [ 'frame', 'src' ],
+    [ 'iframe', 'src' ],
+    [ 'img', 'src' ],
+    [ 'input', 'src' ],
+    [ 'link', 'href' ],
+    [ 'video', 'src' ],
+    [ 'object', 'data' ],
+    [ 'object', 'codeBase' ],
+    [ 'source', 'src' ],
+    [ 'track', 'src' ]
+  ];
+
+  testCases.forEach(c => {
+    test(t => {
+      assert_accepts_trusted_url(c[0], c[1]);
+      assert_throws_no_trusted_type(c[0], c[1], 'A string');
+      assert_throws_no_trusted_type(c[0], c[1], null);
+    }, c[0] + "." + c[1] + " accepts TrustedURL");
+  });
+
+  //TrustedScriptURL Assignments
+  let scriptTestCases = [
+    [ 'embed', 'src' ],
+    [ 'script', 'src' ]
+  ];
+
+  scriptTestCases.forEach(c => {
+    test(t => {
+      assert_accepts_trusted_script_url(c[0], c[1]);
+      assert_throws_no_trusted_type(c[0], c[1], 'A string');
+      assert_throws_no_trusted_type(c[0], c[1], null);
+    }, c[0] + "." + c[1] + " accepts TrustedScriptURL");
+  });
+</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLIFrameElement-src.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('iframe');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('iframe');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var d = document.createElement('iframe');
-    assert_throws(new TypeError(), _ => {
-      d.src = "Fail.";
-    });
-  }, "'src = string' throws.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLImageElement-src.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('img');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('img');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var d = document.createElement('img');
-    assert_throws(new TypeError(), _ => {
-      d.src = "Fail.";
-    });
-  }, "'src = string' throws.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLLinkElement-href.tentative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
-
-  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
-</head>
-<body>
-<script>
-  //helper function for the tests
-  function testHref(str, url) {
-    var link = document.createElement('link');
-    link.href = url;
-    assert_equals(link.href, str);
-  }
-
-  //URL assignments do not throw.
-  test(t => {
-    testHref(URLS.safe, TrustedURL.create(URLS.safe));
-  }, "link.href = URLS.safe, TrustedURL.create");
-
-  test(t => {
-    testHref(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-  }, "link.href = URLS.safe, TrustedURL.unsafelyCreate");
-
-  // String assignments throw.
-  test(t => {
-    var link = document.createElement('link');
-    assert_throws(new TypeError(), _ => {
-      link.href = "A string";
-    });
-  }, "`link.href = string` throws");
-
-  //Null assignment throws.
-  test(t => {
-    var link = document.createElement('link');
-    assert_throws(new TypeError(), _ => {
-      link.href = null;
-    });
-  }, "`link.href = null` throws");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLMediaElement-src.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('video');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('video');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var d = document.createElement('video');
-    assert_throws(new TypeError(), _ => {
-      d.src = "Fail.";
-    });
-  }, "'src = string' throws.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLObjectElement.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="support/helper.sub.js"></script>
-
-  <meta http-equiv="Content-Security-Policy" content="require-trusted-types">
-</head>
-<body>
-<script>
-  //helper function for the tests
-  function testData(str, url) {
-    var objectElement = document.createElement('object');
-    objectElement.data = url;
-    objectElement.codeBase = url;
-    assert_equals(objectElement.data, str);
-    assert_equals(objectElement.codeBase, str);
-  }
-
-  //URL assignments do not throw
-  test(t => {
-    testData(URLS.safe, TrustedURL.create(URLS.safe));
-  }, "Basic processing: safe URL, safe construction.");
-
-  test(t => {
-    testData(URLS.safe, TrustedURL.unsafelyCreate(URLS.safe));
-  }, "Basic processing: safe URL, unsafe construction.");
-
-  //String assignments throw
-  test(t => {
-    var objectElement = document.createElement('object');
-    assert_throws(new TypeError(), _ => {
-      objectElement.data = "A string";
-    });
-  }, "`objectElement.data = string` throws");
-
-  test(t => {
-    var objectElement = document.createElement('object');
-    assert_throws(new TypeError(), _ => {
-      objectElement.codeBase = "A string";
-    });
-  }, "`objectElement.codeBase = string` throws");
-
-  //Null assignment throws.
-  test(t => {
-    var objectElement = document.createElement('object');
-    assert_throws(new TypeError(), _ => {
-      objectElement.data = null;
-    });
-  }, "`objectElement.data = null` throws");
-
-  //Null assignment throws.
-  test(t => {
-    var objectElement = document.createElement('object');
-    assert_throws(new TypeError(), _ => {
-      objectElement.codeBase = null;
-    });
-  }, "`objectElement.codeBase = null` throws");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLSourceElement-src.tentative.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('source');
-    d.src = url;
-    assert_equals(d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('source');
-    d.src = url;
-    assert_equals(d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var url = "Fail."
-
-    var d = document.createElement('source');
-    assert_throws(new TypeError(), _ => {
-      d.src = url;
-    });
-  }, "'src = string' throws.");
-</script>
-
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-embed-src.tentative.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.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');
-    assert_throws(new TypeError(), _ => {
-      s.src = "Fail.";
-    });
-    assert_equals('', s.src);
-  }, "src = 'string' assignment throws.");
-
-  // TrustedURL assignments throw.
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var s = document.createElement('embed');
-    assert_throws(new TypeError(), _ => {
-      s.src = url;
-    });
-    assert_equals('', s.src);
-  }, "src = TrustedURL.unsafelyCreate(URLS.safe) assignment throws");
-
-  // TrustedScriptURL assignments work.
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
-
-    var s = document.createElement('embed');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "src = TrustedScriptURL.unsafelyCreate(URLS.safe)");
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.javascript);
-
-    var s = document.createElement('embed');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "src = TrustedScriptURL.unsafelyCreate(URLS.javascript)");
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.external);
-
-    var s = document.createElement('embed');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "src = TrustedScriptURL.unsafelyCreate(URLS.external)");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-frame-src.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('frame');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('frame');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var d = document.createElement('frame');
-    assert_throws(new TypeError(), _ => {
-      d.src = "Fail.";
-    });
-  }, "'src = string' throws.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-input-src.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('input');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('input');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var d = document.createElement('input');
-    assert_throws(new TypeError(), _ => {
-      d.src = "Fail.";
-    });
-  }, "'src = string' throws.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-script-src.tentative.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.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');
-    assert_throws(new TypeError(), _ => {
-      s.src = URLS.safe;
-    });
-    assert_equals('', s.src);
-  }, "'string'");
-
-  // TrustedURL assignments throw.
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var s = document.createElement('script');
-    assert_throws(new TypeError(), _ => {
-      s.src = url;
-    });
-    assert_equals('', s.src);
-  }, "TrustedURL(safe)");
-
-  // TrustedScriptURL assignments work.
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.safe);
-
-    var s = document.createElement('script');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "TrustedScriptURL(safe)");
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.javascript);
-
-    var s = document.createElement('script');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "TrustedScriptURL(javascript)");
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.external);
-
-    var s = document.createElement('script');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "TrustedScriptURL(external)");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/block-string-assignment-to-track-src.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-
-    var d = document.createElement('track');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('track');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-
-  //String assignment throws
-  test(t => {
-    var d = document.createElement('track');
-    assert_throws(new TypeError(), _ => {
-      d.src = "Fail.";
-    });
-  }, "'src = string' throws.");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/embed-src.tentative.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-  }, "src = TrustedScriptURL.unsafelyCreate(URLS.safe)");
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.javascript);
-
-    var s = document.createElement('embed');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "src = TrustedScriptURL.unsafelyCreate(URLS.javascript)");
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.external);
-
-    var s = document.createElement('embed');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  }, "src = TrustedScriptURL.unsafelyCreate(URLS.external)");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/frame-src.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.sub.js"></script>
-
-<body>
-<script>
-  test(t => {
-    var url = TrustedURL.create(URLS.safe);
-
-    var d = document.createElement('frame');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('frame');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/input-src.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.sub.js"></script>
-
-<body>
-<script>
-  test(t => {
-    var url = TrustedURL.create(URLS.safe);
-
-    var d = document.createElement('input');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('input');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/script-src.tentative.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.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);
-  });
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.javascript);
-
-    var s = document.createElement('script');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  });
-
-  test(t => {
-    var url = TrustedScriptURL.unsafelyCreate(URLS.external);
-
-    var s = document.createElement('script');
-    s.src = url;
-    assert_equals(url + '', s.src);
-  });
-</script>
--- a/testing/web-platform/tests/trusted-types/support/helper.sub.js
+++ b/testing/web-platform/tests/trusted-types/support/helper.sub.js
@@ -40,8 +40,36 @@ function createFrameAndHref(href) {
       } catch (ex) {
         i.remove();
         reject(ex);
       }
     };
     document.body.appendChild(i);
   });
 }
+
+let trustedHTML = TrustedHTML.escape(STRINGS.unescapedHTML);
+function assert_accepts_trusted_html(tag, attribute) {
+  let elem = document.createElement(tag);
+  elem[attribute] = trustedHTML;
+  assert_equals(elem[attribute] + "", STRINGS.unescapedHTML);
+}
+
+let trustedURL = TrustedURL.create(URLS.safe);
+function assert_accepts_trusted_url(tag, attribute) {
+  let elem = document.createElement(tag);
+  elem[attribute] = trustedURL;
+  assert_equals(elem[attribute] + "", URLS.safe);
+}
+
+let trustedScriptURL = TrustedScriptURL.unsafelyCreate(URLS.safe);
+function assert_accepts_trusted_script_url(tag, attribute) {
+  let elem = document.createElement(tag);
+  elem[attribute] = trustedScriptURL;
+  assert_equals(elem[attribute] + "", URLS.safe);
+}
+
+function assert_throws_no_trusted_type(tag, attribute, value) {
+  let elem = document.createElement(tag);
+  assert_throws(new TypeError(), _ => {
+    elem[attribute] = value;
+  });
+}
deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/track-src.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.sub.js"></script>
-
-<body>
-<script>
-  test(t => {
-    var url = TrustedURL.create(URLS.safe);
-
-    var d = document.createElement('track');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.create().");
-
-  test(t => {
-    var url = TrustedURL.unsafelyCreate(URLS.safe);
-
-    var d = document.createElement('track');
-    d.src = url;
-    assert_equals("" + d.src, URLS.safe);
-  }, "src = TrustedURL.unsafelyCreate().");
-</script>