Fixes: unload-a-document tests do not respect wss variant

Arno Renevier · chromium-wpt-export-bot · commit 03f5a82a3047 · 2020-11-24T19:39:23.000-08:00
tests in third_party/blink/web_tests/external/wpt/websockets/unload-a-document/ have wss variant. But when opening a popup, they don't pass the location.search parameter to their children. So for example, 001.html?wss will 001-1.html. And since 001-1.html has no knowledge of the wss param, it will (incorrectly) open an insecure sockets. Because of that, tests in websockets/unload-a-document always run the insecure variant. This patch fixes the issue. Bug: 801564 Change-Id: Ib88aa1c12dc6f8a390f650b164cd4cd203939a43 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552078 Reviewed-by: Adam Rice <ricea@chromium.org> Commit-Queue: Arnaud Renevier <arenevier@fb.com> Cr-Commit-Position: refs/heads/master@{#830853}
diff --git a/websockets/unload-a-document/001-1.html b/websockets/unload-a-document/001-1.html
@@ -1,8 +1,6 @@
 <!doctype html>
 <title>WebSockets: navigating top-level browsing context</title>
 <script src=../constants.js?pipe=sub></script>
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
 <script>
 var controller = opener || parent;
 var t = controller.t;
diff --git a/websockets/unload-a-document/001.html b/websockets/unload-a-document/001.html
@@ -14,7 +14,7 @@
 var uuid;
 t.step(function() {
   uuid = token()
-  w = window.open("001-1.html");
+  w = window.open("001-1.html" + location.search);
   add_result_callback(function() {
     w.close();
   });
diff --git a/websockets/unload-a-document/002-1.html b/websockets/unload-a-document/002-1.html
@@ -1,8 +1,6 @@
 <!doctype html>
 <title>WebSockets: navigating top-level browsing context with closed websocket</title>
 <script src=../constants.js?pipe=sub></script>
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
 <script>
 var controller = opener || parent;
 var t = controller.t;
diff --git a/websockets/unload-a-document/002.html b/websockets/unload-a-document/002.html
@@ -15,7 +15,7 @@
 var uuid;
 t.step(function() {
   uuid = token()
-  w = window.open("002-1.html");
+  w = window.open("002-1.html" + location.search);
   add_result_callback(function() {
     w.close();
   });
diff --git a/websockets/unload-a-document/005-1.html b/websockets/unload-a-document/005-1.html
@@ -1,8 +1,6 @@
 <!doctype html>
 <title>WebSockets: navigating nested browsing context with a websocket in top-level</title>
 <script src=../constants.js?pipe=sub></script>
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
 <script>
 var t = opener.t;
 var assert_unreached = opener.assert_unreached;
diff --git a/websockets/unload-a-document/005.html b/websockets/unload-a-document/005.html
@@ -12,7 +12,7 @@
 <script>
 var t = async_test();
 t.step(function() {
-  var w = window.open("005-1.html");
+  var w = window.open("005-1.html" + location.search);
   add_result_callback(function() {
     w.close();
   });
