[Critical-CH] Refactor WPTs

Remove duplicate code and move to slightly less flaky messages

Bug: 1127313
Change-Id: I926c6f66d23ac6ed101ff85777d187a45ad9a50f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519393
Commit-Queue: Aaron Tagliaboschi <aarontag@chromium.org>
Reviewed-by: Yoav Weiss <yoavweiss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824415}

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/iframe.https.window.js

+// META: script=resources/util.js
+
 async_test((t) => {
   var iframe = document.createElement("iframe");
-  iframe.addEventListener('load', (e) => {
-    t.step(()=>{assert_equals(iframe.contentDocument.body.textContent, "FAIL");});
-    t.done();
-  });
-  iframe.src = "resources/echo-critical-hint.py";
+  iframe.src = ECHO_URL;
   document.body.appendChild(iframe);
+  iframe.contentWindow.addEventListener('message', message_listener(t, "FAIL"));
 }, "Critical-CH iframe");

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/mis-matched-count.https.window.js

+// META: script=resources/util.js
 // META: script=/common/utils.js
 
-async_test((t) => {
-  var popup_window = window.open("resources/echo-critical-hint.py?mismatch=true&token="+token());
-  assert_not_equals(popup_window, null, "Popup windows not allowed?");
-  popup_window.addEventListener('load', (e) => {
-    t.step(()=>{assert_equals(popup_window.document.body.textContent, "1")});
-    t.done();
-  });
-}, "Critical-CH navigation")
+async_test(make_message_test(ECHO_URL+"?mismatch=true&token="+token(), "1"), "Critical-CH no restart on mismatched hints")

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/mis-matched.https.window.js

-async_test((t) => {
-  var popup_window = window.open("resources/echo-critical-hint.py?mismatch=true");
-  assert_not_equals(popup_window, null, "Popup windows not allowed?");
-  popup_window.addEventListener('load', (e) => {
-    t.step(()=>{assert_equals(popup_window.document.body.textContent, "FAIL")});
-    t.done();
-  });
-}, "Critical-CH navigation")
+// META: script=resources/util.js
+
+async_test(make_message_test(ECHO_URL+"?mismatch=true", "FAIL"), "Critical-CH Mis-matched hints")

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/navigation.https.window.js

-async_test((t) => {
-  var popup_window = window.open("resources/echo-critical-hint.py");
-  assert_not_equals(popup_window, null, "Popup windows not allowed?");
-  popup_window.addEventListener('load', (e) => {
-    t.step(()=>{assert_equals(popup_window.document.body.textContent, "PASS")});
-    t.done();
-  });
-}, "Critical-CH navigation")
+// META: script=resources/util.js
+
+async_test(make_message_test(ECHO_URL, "PASS"), "Critical-CH navigation")

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/non-secure.http.window.js

-async_test((t) => {
-  var popup_window = window.open("resources/echo-critical-hint.py");
-  assert_not_equals(popup_window, null, "Popup windows not allowed?");
-  popup_window.addEventListener('load', (e) => {
-    t.step(()=>{assert_equals(popup_window.document.body.textContent, "FAIL")});
-    t.done();
-  });
-}, "Critical-CH non-secure navigation")
+// META: script=resources/util.js
+
+async_test(make_message_test(ECHO_URL, "FAIL"), "Critical-CH navigation non-secure")

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/request-count.https.window.js

+// META: script=resources/util.js
 // META: script=/common/utils.js
 
-async_test((t) => {
-  var popup_window = window.open("resources/echo-critical-hint.py?token="+token());
-  assert_not_equals(popup_window, null, "Popup windows not allowed?");
-  popup_window.addEventListener('load', (e) => {
-    t.step(()=>{assert_equals(popup_window.document.body.textContent, "2")});
-    t.done();
-  });
-}, "Critical-CH navigation")
+async_test(make_message_test(ECHO_URL+"?token="+token(), "2"), "Critical-CH navigation restart")

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/resources/echo-critical-hint.py

@@ -40,4 +40,4 @@ def main(request, response):
     if b"viewport-width" in request.headers:
       result = "MISMATCH"
 
-    response.content = result
+    response.content = "<script>window.postMessage('{0}', '*')</script>".format(result)

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/resources/util.js

+ECHO_URL = "resources/echo-critical-hint.py"
+
+message_listener = (t, message) =>
+  (e) => {
+    t.step(()=>{assert_equals(e.data, message)});
+    t.done();
+  }
+
+make_message_test = (url, message) =>
+  (t) => {
+    popup_window = window.open("/common/blank.html");
+    assert_not_equals(popup_window, null, "Popup windows not allowed?");
+    popup_window.addEventListener('message', message_listener(t, message));
+    popup_window.location = url;
+  }

third_party/blink/web_tests/external/wpt/client-hints/critical-ch/subresource.https.window.js

+// META: script=resources/util.js
+// META: script=/common/utils.js
+
 promise_test(() =>
   fetch("resources/echo-critical-hint.py")
       .then((r) => r.text())
       .then((r) => {
-        assert_equals(r, "FAIL");
+        assert_true(r.includes("FAIL"));
       })
-, "Critical-CH");
+, "Critical-CH subresource fetch");

third_party/blink/web_tests/virtual/legacy-client-hints-no-fp-delegation/external/wpt/client-hints/critical-ch/request-count.https.window-expected.txt

 This is a testharness.js-based test.
-FAIL Critical-CH navigation assert_equals: expected "2" but got "1"
+FAIL Critical-CH navigation restart assert_equals: expected "2" but got "1"
 Harness: the test ran to completion.