[go: nahoru, domu]

Split other blocked cookies tests to avoid them timing out.


Bug: 1280537, 1280736, 1276206
Change-Id: I9c3021f1925f276a84962b056ca3439581d65b95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714290
Commit-Queue: Danil Somsikov <dsv@chromium.org>
Auto-Submit: Danil Somsikov <dsv@chromium.org>
Reviewed-by: Simon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1015949}
diff --git a/third_party/blink/web_tests/SlowTests b/third_party/blink/web_tests/SlowTests
index 92681a6..e910d59 100644
--- a/third_party/blink/web_tests/SlowTests
+++ b/third_party/blink/web_tests/SlowTests
@@ -84,12 +84,16 @@
 crbug.com/1280873 http/tests/inspector-protocol/network/xhr-cors-preflight-redirect-failure.js [ Slow ]
 crbug.com/1280697 http/tests/inspector-protocol/network/block_cross_site_document_load.js [ Slow ]
 crbug.com/1280585 http/tests/inspector-protocol/network/xhr-post-replay-cors.js [ Slow ]
-crbug.com/1280537 http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js [ Slow ]
+crbug.com/1280537 http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-browser-navigate.js [ Slow ]
+crbug.com/1280537 http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-navigate.js [ Slow ]
+crbug.com/1280537 http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-subresource.js [ Slow ]
 crbug.com/1279832 http/tests/inspector-protocol/network/cross-origin-isolation/coop-coep-get-security-isolation-info.js [ Slow ]
 crbug.com/1277877 http/tests/inspector-protocol/network/blocked-cookie-same-site-strict-browser-navigate.js [ Slow ]
 crbug.com/1277877 http/tests/inspector-protocol/network/blocked-cookie-same-site-strict-js-navigate.js [ Slow ]
 crbug.com/1277877 http/tests/inspector-protocol/network/blocked-cookie-same-site-strict-js-subresource.js [ Slow ]
-crbug.com/1280736 http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict.js [ Slow ]
+crbug.com/1280736 http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate.js [ Slow ]
+crbug.com/1280736 http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate.js [ Slow ]
+crbug.com/1280736 http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource.js [ Slow ]
 crbug.com/1327867 http/tests/inspector-protocol/network/initiator-minified.js [ Slow ]
 crbug.com/1325514 http/tests/inspector-protocol/network/cookies-protocol-test.js [ Slow ]
 crbug.com/1280882 http/tests/inspector-protocol/network/cors-errors.js [ Slow ]
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
index b635a60..023a44f 100644
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -6581,7 +6581,6 @@
 crbug.com/1276201 [ Mac11-arm64 ] external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-width-height.html [ Skip ]
 crbug.com/1275967 [ Linux ] external/wpt/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html [ Failure Pass ]
 crbug.com/1275944 [ Mac ] http/tests/devtools/sources/debugger-ui/reveal-not-skipped.js [ Failure Pass ]
-crbug.com/1276206 http/tests/inspector-protocol/network/blocked-cookie-same-party.js [ Failure Pass Timeout ]
 crbug.com/1276207 virtual/gpu-rasterization/images/color-profile-image-object-fit.html [ Failure Pass ]
 crbug.com/1276208 [ Mac ] virtual/oopr-canvas2d/fast/canvas/canvas-fillPath-alpha-shadow.html [ Pass Timeout ]
 crbug.com/1276290 [ Mac ] wpt_internal/mediastream/mediastreamtrackprocessor-transfer-to-worker.html [ Skip ]
@@ -6635,8 +6634,12 @@
 # Sheriff 2021-12-30
 crbug.com/1229096 [ Win ] fast/scrolling/events/overscroll-event-fired-to-scrolled-element.html [ Failure Pass ]
 crbug.com/1279758 [ Win10.20h2 ] virtual/threaded-prefer-compositing/fast/scrolling/scroll-animation-on-by-default.html [ Failure Pass ]
-crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict.js [ Pass Timeout ]
-crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax.js [ Pass Timeout ]
+crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate.js [ Pass Timeout ]
+crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate.js [ Pass Timeout ]
+crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource.js [ Pass Timeout ]
+crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate.js [ Pass Timeout ]
+crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate.js [ Pass Timeout ]
+crbug.com/1280736 [ Win10.20h2 ] http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource.js [ Pass Timeout ]
 
 # Sheriff 2022-01-04
 crbug.com/1283865 external/wpt/webmessaging/without-ports/020.html [ Failure Pass ]
@@ -6651,7 +6654,9 @@
 crbug.com/1285438 fast/layers/clip-rects-transformed.html [ Failure Pass ]
 crbug.com/1285431 [ Mac ] virtual/backface-visibility-interop/compositing/overflow/transform-should-update-absolute-clip-rects.html [ Crash Failure Pass ]
 crbug.com/1285437 virtual/scroll-unification-prefer_compositing_to_lcd_text/fast/scroll-behavior/smooth-scroll/ongoing-smooth-scroll-vertical-rl-anchors.html [ Pass Timeout ]
-crbug.com/1285436 virtual/partitioned-cookies/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax.js [ Crash Failure Pass Timeout ]
+crbug.com/1285436 virtual/partitioned-cookies/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate.js [ Crash Failure Pass Timeout ]
+crbug.com/1285436 virtual/partitioned-cookies/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate.js [ Crash Failure Pass Timeout ]
+crbug.com/1285436 virtual/partitioned-cookies/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource.js [ Crash Failure Pass Timeout ]
 
 # Sheriff 2022-01-12
 crbug.com/1286619 [ Mac ] external/wpt/storage-access-api/storageAccess.testdriver.sub.html [ Failure Pass ]
@@ -6834,7 +6839,6 @@
 crbug.com/1269534 fast/spatial-navigation/snav-zero-margin-content.html [ Failure Pass ]
 crbug.com/1295980 virtual/fenced-frame-mparch/wpt_internal/fenced_frame/user-activation.https.html [ Failure Pass Timeout ]
 crbug.com/1295980 virtual/fenced-frame-shadow-dom/wpt_internal/fenced_frame/user-activation.https.html [ Failure Pass Timeout ]
-crbug.com/1280537 virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js [ Failure Pass Timeout ]
 crbug.com/1298633 http/tests/inspector-protocol/network/cross-origin-isolation/coep-load-error-reporting-worker.js [ Pass Timeout ]
 
 # Sheriff 2022-03-16
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-browser-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-browser-navigate.js
new file mode 100644
index 0000000..43e0da7
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-browser-navigate.js
@@ -0,0 +1,22 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross-party navigation requests from browser with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.\n`);
+  await dp.Network.enable();
+
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameParty; SameSite=None; Secure');
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // set the SameParty cookie
+  await helper.navigateWithExtraInfo(setCookieUrl);
+
+  // navigate to a cross-party domain and back from the browser and see that the cookie is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  let {requestExtraInfo} = await helper.navigateWithExtraInfo(firstPartyUrl);
+  testRunner.log(requestExtraInfo.params.associatedCookies, 'Browser initiated navigation associated cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-navigate.js
new file mode 100644
index 0000000..ce9f4006
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-navigate.js
@@ -0,0 +1,22 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross-party navigation requests from JS with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.\n`);
+  await dp.Network.enable();
+
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameParty; SameSite=None; Secure');
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // set the SameParty cookie
+  await helper.navigateWithExtraInfo(setCookieUrl);
+
+  // navigate to a cross-party domain and back from javascript and see that the cookie is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  ({requestExtraInfo} = await helper.jsNavigateWithExtraInfo(firstPartyUrl));
+  testRunner.log(requestExtraInfo.params.associatedCookies, 'Javascript initiated navigation associated cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource.js
new file mode 100644
index 0000000..667b20e
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource.js
@@ -0,0 +1,22 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross-party subresource requests from JS with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.\n`);
+  await dp.Network.enable();
+
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameParty; SameSite=None; Secure');
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // set the SameParty cookie
+  await helper.navigateWithExtraInfo(setCookieUrl);
+
+  // navigate away and make a subresource request from javascript, see that the cookie is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  ({requestExtraInfo} = await helper.fetchWithExtraInfo(firstPartyUrl));
+  testRunner.log(requestExtraInfo.params.associatedCookies, 'Javascript initiated subresource associated cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party.js
deleted file mode 100644
index 607393c..0000000
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-party.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      `Verifies that making cross-party requests with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.\n`);
-  await dp.Network.enable();
-
-  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
-      + encodeURIComponent('name=value; SameParty; SameSite=None; Secure');
-  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
-  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
-
-  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
-
-  // set the SameParty cookie
-  await helper.navigateWithExtraInfo(setCookieUrl);
-
-  // navigate to a cross-party domain and back from the browser and see that the cookie is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  let {requestExtraInfo} = await helper.navigateWithExtraInfo(firstPartyUrl);
-  testRunner.log(requestExtraInfo.params.associatedCookies, 'Browser initiated navigation associated cookies:');
-
-  // navigate to a cross-party domain and back from javascript and see that the cookie is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  ({requestExtraInfo} = await helper.jsNavigateWithExtraInfo(firstPartyUrl));
-  testRunner.log(requestExtraInfo.params.associatedCookies, 'Javascript initiated navigation associated cookies:');
-
-  // navigate away and make a subresource request from javascript, see that the cookie is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  ({requestExtraInfo} = await helper.fetchWithExtraInfo(firstPartyUrl));
-  testRunner.log(requestExtraInfo.params.associatedCookies, 'Javascript initiated subresource associated cookies:');
-
-  testRunner.completeTest();
-})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-browser-navigate.js
similarity index 100%
rename from third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js
rename to third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-browser-navigate.js
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-navigate.js
similarity index 100%
copy from third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js
copy to third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-navigate.js
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-subresource.js
similarity index 100%
copy from third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax.js
copy to third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-subresource.js
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-browser-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-browser-navigate.js
new file mode 100644
index 0000000..b7496d0
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-browser-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross-party navigation requests from browser which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=None; SameParty; Secure');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party navigation via browser to set the cookie, see that it is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  ({responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl));
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-navigate.js
new file mode 100644
index 0000000..c1fe76e
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross-party navigation requests from JS which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=None; SameParty; Secure');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party navigation via javascript to set the cookie, see that it is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  ({responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl));
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource.js
new file mode 100644
index 0000000..2bafe93
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross-party subresource requests from JS which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=None; SameParty; Secure');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party request to set the cookie, see that it is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party.js
deleted file mode 100644
index 6d53c05..0000000
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      `Verifies that making cross-party requests which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
-  await dp.Network.enable();
-
-  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
-  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
-      + encodeURIComponent('name=value; SameSite=None; SameParty; Secure');
-
-  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
-
-  // make a cross-party request to set the cookie, see that it is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
-
-  // make a cross-party navigation via javascript to set the cookie, see that it is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  ({responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl));
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
-
-  // make a cross-party navigation via browser to set the cookie, see that it is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  ({responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl));
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
-
-  testRunner.completeTest();
-})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-browser-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-browser-navigate.js
new file mode 100644
index 0000000..d6eca36
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-browser-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making navigation requests from browser which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=None; SameParty');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party navigation via browser to set the cookie, see that it is blocked
+  await helper.navigateWithExtraInfo(firstPartyUrl);
+  ({responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl));
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-navigate.js
new file mode 100644
index 0000000..b1daa94
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making navigation requests from JS which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=None; SameParty');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party navigation via javascript to set the cookie, see that it is blocked
+  await helper.navigateWithExtraInfo(firstPartyUrl);
+  ({responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl));
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-subresource.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-subresource.js
new file mode 100644
index 0000000..005d941
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-subresource.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making subresource requests from JS which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=None; SameParty');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party request to set the cookie, see that it is blocked
+  await helper.navigateWithExtraInfo(firstPartyUrl);
+  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure.js
deleted file mode 100644
index 21e2695..0000000
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      `Verifies that making requests which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
-  await dp.Network.enable();
-
-  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
-  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
-      + encodeURIComponent('name=value; SameSite=None; SameParty');
-
-  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
-
-  // make a cross-party request to set the cookie, see that it is blocked
-  await helper.navigateWithExtraInfo(firstPartyUrl);
-  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
-
-  // make a cross-party navigation via javascript to set the cookie, see that it is blocked
-  await helper.navigateWithExtraInfo(firstPartyUrl);
-  ({responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl));
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
-
-  // make a cross-party navigation via browser to set the cookie, see that it is blocked
-  await helper.navigateWithExtraInfo(firstPartyUrl);
-  ({responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl));
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
-
-  testRunner.completeTest();
-})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-browser-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-browser-navigate.js
new file mode 100644
index 0000000..ae52c06
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-browser-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making subresource requests from JS which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Strict; SameParty; Secure');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party request to set the cookie, see that it gets blocked
+  await helper.navigateWithExtraInfo(firstPartyUrl);
+  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-navigate.js
new file mode 100644
index 0000000..10cbd2f
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making navigation requests from JS which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Strict; SameParty; Secure');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party navigation via javascript to set the cookie, see that it is blocked
+  await helper.navigateWithExtraInfo(firstPartyUrl);
+  const {responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-subresource.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-subresource.js
new file mode 100644
index 0000000..ae52c06
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-subresource.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making subresource requests from JS which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Strict; SameParty; Secure');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross-party request to set the cookie, see that it gets blocked
+  await helper.navigateWithExtraInfo(firstPartyUrl);
+  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict.js
deleted file mode 100644
index 1347d0d..0000000
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      `Verifies that making requests which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
-  await dp.Network.enable();
-
-  const firstPartyUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/hello-world.html';
-  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
-      + encodeURIComponent('name=value; SameSite=Strict; SameParty; Secure');
-
-  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
-
-  // make a cross-party request to set the cookie, see that it gets blocked
-  await helper.navigateWithExtraInfo(firstPartyUrl);
-  let {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
-
-  // make a cross-party navigation via javascript to set the cookie, see that it is blocked
-  await helper.navigateWithExtraInfo(firstPartyUrl);
-  ({responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl));
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
-
-  // make a cross-party navigation via browser to set the cookie, see that it is blocked
-  await helper.navigateWithExtraInfo(firstPartyUrl);
-  ({responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl));
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
-
-  testRunner.completeTest();
-})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate.js
new file mode 100644
index 0000000..a9ef96b
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross origin navigation requests from browser which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Lax');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross origin navigation via browser to set the cookie, see that it is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  var {responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate.js
new file mode 100644
index 0000000..d3ebfca
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross origin navigation requests from JS which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Lax');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross origin navigation via javascript to set the cookie, see that it is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  var {responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource.js
new file mode 100644
index 0000000..fc2288e9
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross origin subresource requests from JS which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Lax');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross origin request to set the cookie, see that it gets blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  var {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax.js
deleted file mode 100644
index 11e1a7d..0000000
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      `Verifies that making cross origin requests which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
-  await dp.Network.enable();
-
-  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
-  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
-      + encodeURIComponent('name=value; SameSite=Lax');
-
-  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
-
-  // make a cross origin request to set the cookie, see that it gets blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  var {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
-
-  // make a cross origin navigation via javascript to set the cookie, see that it is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  var {responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
-
-  // make a cross origin navigation via browser to set the cookie, see that it is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  var {responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies');
-
-  testRunner.completeTest();
-})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate.js
new file mode 100644
index 0000000..d1ff62b
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross origin navigation requests from browser which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Strict');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross origin navigation via browser to set the cookie, see that it is not blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  var {responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate.js
new file mode 100644
index 0000000..1b767275
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross origin navigation requests from JS which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Strict');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross origin navigation via javascript to set the cookie, see that it gets blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  var {responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource.js
new file mode 100644
index 0000000..9fb83d4
--- /dev/null
+++ b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource.js
@@ -0,0 +1,18 @@
+(async function(testRunner) {
+  const {page, session, dp} = await testRunner.startBlank(
+      `Verifies that making cross origin subresource requests from JS which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
+  await dp.Network.enable();
+
+  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
+  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
+      + encodeURIComponent('name=value; SameSite=Strict');
+
+  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
+
+  // make a cross origin request to set the cookie, see that it gets blocked
+  await helper.navigateWithExtraInfo(thirdPartyUrl);
+  var {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
+  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
+
+  testRunner.completeTest();
+})
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict.js b/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict.js
deleted file mode 100644
index 48c255a..0000000
--- a/third_party/blink/web_tests/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      `Verifies that making cross origin requests which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.\n`);
-  await dp.Network.enable();
-
-  const thirdPartyUrl = 'https://thirdparty.test:8443/inspector-protocol/network/resources/hello-world.html';
-  const setCookieUrl = 'https://cookie.test:8443/inspector-protocol/network/resources/set-cookie.php?cookie='
-      + encodeURIComponent('name=value; SameSite=Strict');
-
-  const helper = (await testRunner.loadScript('resources/extra-info-helper.js'))(dp, session);
-
-  // make a cross origin request to set the cookie, see that it gets blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  var {responseExtraInfo} = await helper.fetchWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated subresource blocked set-cookies:');
-
-  // make a cross origin navigation via javascript to set the cookie, see that it gets blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  var {responseExtraInfo} = await helper.jsNavigateWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Javascript initiated navigation blocked set-cookies:');
-
-  // make a cross origin navigation via browser to set the cookie, see that it is not blocked
-  await helper.navigateWithExtraInfo(thirdPartyUrl);
-  var {responseExtraInfo} = await helper.navigateWithExtraInfo(setCookieUrl);
-  testRunner.log(responseExtraInfo.params.blockedCookies, 'Browser initiated navigation blocked set-cookies:');
-
-  testRunner.completeTest();
-})
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-browser-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-browser-navigate-expected.txt
new file mode 100644
index 0000000..7be25cc8
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-browser-navigate-expected.txt
@@ -0,0 +1,25 @@
+Verifies that making cross-party navigation requests from browser with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.
+
+Browser initiated navigation associated cookies:[
+    [0] : {
+        blockedReasons : [
+        ]
+        cookie : {
+            domain : cookie.test
+            expires : -1
+            httpOnly : false
+            name : name
+            path : /inspector-protocol/network/resources
+            priority : Medium
+            sameParty : true
+            sameSite : None
+            secure : true
+            session : true
+            size : 9
+            sourcePort : 8443
+            sourceScheme : Secure
+            value : value
+        }
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-expected.txt
deleted file mode 100644
index e49d2d8..0000000
--- a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-expected.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Verifies that making cross-party requests with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.
-
-Browser initiated navigation associated cookies:[
-    [0] : {
-        blockedReasons : [
-        ]
-        cookie : {
-            domain : cookie.test
-            expires : -1
-            httpOnly : false
-            name : name
-            path : /inspector-protocol/network/resources
-            priority : Medium
-            sameParty : true
-            sameSite : None
-            secure : true
-            session : true
-            size : 9
-            sourcePort : 8443
-            sourceScheme : Secure
-            value : value
-        }
-    }
-]
-Javascript initiated navigation associated cookies:[
-    [0] : {
-        blockedReasons : [
-        ]
-        cookie : {
-            domain : cookie.test
-            expires : -1
-            httpOnly : false
-            name : name
-            path : /inspector-protocol/network/resources
-            priority : Medium
-            sameParty : true
-            sameSite : None
-            secure : true
-            session : true
-            size : 9
-            sourcePort : 8443
-            sourceScheme : Secure
-            value : value
-        }
-    }
-]
-Javascript initiated subresource associated cookies:[
-    [0] : {
-        blockedReasons : [
-        ]
-        cookie : {
-            domain : cookie.test
-            expires : -1
-            httpOnly : false
-            name : name
-            path : /inspector-protocol/network/resources
-            priority : Medium
-            sameParty : true
-            sameSite : None
-            secure : true
-            session : true
-            size : 9
-            sourcePort : 8443
-            sourceScheme : Secure
-            value : value
-        }
-    }
-]
-
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-issue-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-issue-expected.txt
new file mode 100644
index 0000000..681c4252
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-issue-expected.txt
@@ -0,0 +1,28 @@
+Verifies that making cross-party requests with SameParty cookies results in a blocked cookie issue
+
+Javascript initiated subresource associated cookies:[
+    [0] : {
+        blockedReasons : [
+        ]
+        cookie : {
+            domain : cookie.test
+            expires : -1
+            httpOnly : false
+            name : name
+            path : /inspector-protocol/network/resources
+            priority : Medium
+            sameParty : true
+            sameSite : None
+            secure : true
+            session : true
+            size : 9
+            sourcePort : 8443
+            sourceScheme : Secure
+            value : value
+        }
+    }
+]
+Error while executing test script: TypeError: Cannot read properties of undefined (reading 'params')
+TypeError: Cannot read properties of undefined (reading 'params')
+    at eval (http://127.0.0.1:8000/inspector-protocol/network/blocked-cookie-same-party-issue.js:26:34)
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-navigate-expected.txt
new file mode 100644
index 0000000..04cf2184
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-navigate-expected.txt
@@ -0,0 +1,25 @@
+Verifies that making cross-party navigation requests from JS with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.
+
+Javascript initiated navigation associated cookies:[
+    [0] : {
+        blockedReasons : [
+        ]
+        cookie : {
+            domain : cookie.test
+            expires : -1
+            httpOnly : false
+            name : name
+            path : /inspector-protocol/network/resources
+            priority : Medium
+            sameParty : true
+            sameSite : None
+            secure : true
+            session : true
+            size : 9
+            sourcePort : 8443
+            sourceScheme : Secure
+            value : value
+        }
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource-expected.txt
new file mode 100644
index 0000000..32bccaa
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource-expected.txt
@@ -0,0 +1,25 @@
+Verifies that making cross-party subresource requests from JS with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.
+
+Javascript initiated subresource associated cookies:[
+    [0] : {
+        blockedReasons : [
+        ]
+        cookie : {
+            domain : cookie.test
+            expires : -1
+            httpOnly : false
+            name : name
+            path : /inspector-protocol/network/resources
+            priority : Medium
+            sameParty : true
+            sameSite : None
+            secure : true
+            session : true
+            size : 9
+            sourcePort : 8443
+            sourceScheme : Secure
+            value : value
+        }
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-browser-navigate-expected.txt
similarity index 100%
copy from third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-expected.txt
copy to third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-browser-navigate-expected.txt
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-navigate-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-expected.txt
rename to third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-navigate-expected.txt
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-subresource-expected.txt
similarity index 100%
copy from third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-expected.txt
copy to third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-cookie-same-site-lax-js-subresource-expected.txt
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-browser-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-browser-navigate-expected.txt
new file mode 100644
index 0000000..f5580a7
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-browser-navigate-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross-party navigation requests from browser which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Browser initiated navigation blocked set-cookies:[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-expected.txt
deleted file mode 100644
index abb8a49..0000000
--- a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Verifies that making cross-party requests which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
-
-Javascript initiated subresource blocked set-cookies:[
-]
-Javascript initiated navigation blocked set-cookies:[
-]
-Browser initiated navigation blocked set-cookies:[
-]
-
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-navigate-expected.txt
new file mode 100644
index 0000000..bd3c48a
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-navigate-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross-party navigation requests from JS which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated navigation blocked set-cookies:[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource-expected.txt
new file mode 100644
index 0000000..2d1eb4f
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross-party subresource requests from JS which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated subresource blocked set-cookies:[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-browser-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-browser-navigate-expected.txt
new file mode 100644
index 0000000..bbbe54b
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-browser-navigate-expected.txt
@@ -0,0 +1,11 @@
+Verifies that making navigation requests from browser which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Browser initiated navigation blocked set-cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyConflictsWithOtherAttributes
+        ]
+        cookieLine : name=value; SameSite=None; SameParty
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-expected.txt
deleted file mode 100644
index afc9220..0000000
--- a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Verifies that making requests which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
-
-Javascript initiated subresource blocked set-cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyConflictsWithOtherAttributes
-        ]
-        cookieLine : name=value; SameSite=None; SameParty
-    }
-]
-Javascript initiated navigation blocked set-cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyConflictsWithOtherAttributes
-        ]
-        cookieLine : name=value; SameSite=None; SameParty
-    }
-]
-Browser initiated navigation blocked set-cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyConflictsWithOtherAttributes
-        ]
-        cookieLine : name=value; SameSite=None; SameParty
-    }
-]
-
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-navigate-expected.txt
new file mode 100644
index 0000000..72adbb2
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-navigate-expected.txt
@@ -0,0 +1,11 @@
+Verifies that making navigation requests from JS which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated navigation blocked set-cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyConflictsWithOtherAttributes
+        ]
+        cookieLine : name=value; SameSite=None; SameParty
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-subresource-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-subresource-expected.txt
new file mode 100644
index 0000000..94b59875
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-nonsecure-js-subresource-expected.txt
@@ -0,0 +1,11 @@
+Verifies that making subresource requests from JS which set nonsecure SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated subresource blocked set-cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyConflictsWithOtherAttributes
+        ]
+        cookieLine : name=value; SameSite=None; SameParty
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-browser-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-browser-navigate-expected.txt
new file mode 100644
index 0000000..dc6968a
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-browser-navigate-expected.txt
@@ -0,0 +1,11 @@
+Verifies that making subresource requests from JS which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated subresource blocked set-cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyConflictsWithOtherAttributes
+        ]
+        cookieLine : name=value; SameSite=Strict; SameParty; Secure
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-expected.txt
deleted file mode 100644
index c3fc41dc..0000000
--- a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-expected.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Verifies that making requests which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
-
-Javascript initiated subresource blocked set-cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyConflictsWithOtherAttributes
-        ]
-        cookieLine : name=value; SameSite=Strict; SameParty; Secure
-    }
-]
-Javascript initiated navigation blocked set-cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyConflictsWithOtherAttributes
-        ]
-        cookieLine : name=value; SameSite=Strict; SameParty; Secure
-    }
-]
-Browser initiated navigation blocked set-cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyConflictsWithOtherAttributes
-        ]
-        cookieLine : name=value; SameSite=Strict; SameParty; Secure
-    }
-]
-
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-navigate-expected.txt
new file mode 100644
index 0000000..80d28ac
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-navigate-expected.txt
@@ -0,0 +1,11 @@
+Verifies that making navigation requests from JS which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated navigation blocked set-cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyConflictsWithOtherAttributes
+        ]
+        cookieLine : name=value; SameSite=Strict; SameParty; Secure
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-subresource-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-subresource-expected.txt
new file mode 100644
index 0000000..dc6968a
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-party-invalid-same-site-strict-js-subresource-expected.txt
@@ -0,0 +1,11 @@
+Verifies that making subresource requests from JS which set "SameParty; SameSite=Strict" cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated subresource blocked set-cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyConflictsWithOtherAttributes
+        ]
+        cookieLine : name=value; SameSite=Strict; SameParty; Secure
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate-expected.txt
new file mode 100644
index 0000000..f14acb2
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-browser-navigate-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross origin navigation requests from browser which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Browser initiated navigation blocked set-cookies[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate-expected.txt
new file mode 100644
index 0000000..400b1e3
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-navigate-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross origin navigation requests from JS which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated navigation blocked set-cookies:[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource-expected.txt
similarity index 70%
rename from third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-expected.txt
rename to third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource-expected.txt
index e59cd5a..e262dfab 100644
--- a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-expected.txt
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-lax-js-subresource-expected.txt
@@ -1,4 +1,4 @@
-Verifies that making cross origin requests which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+Verifies that making cross origin subresource requests from JS which set SameSite=Lax cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
 
 Javascript initiated subresource blocked set-cookies:[
     [0] : {
@@ -24,8 +24,4 @@
         cookieLine : name=value; SameSite=Lax
     }
 ]
-Javascript initiated navigation blocked set-cookies:[
-]
-Browser initiated navigation blocked set-cookies[
-]
 
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate-expected.txt
new file mode 100644
index 0000000..c89c68b1
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-browser-navigate-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross origin navigation requests from browser which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Browser initiated navigation blocked set-cookies:[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate-expected.txt
new file mode 100644
index 0000000..a5fec910
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-navigate-expected.txt
@@ -0,0 +1,5 @@
+Verifies that making cross origin navigation requests from JS which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+
+Javascript initiated navigation blocked set-cookies:[
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-expected.txt b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource-expected.txt
similarity index 70%
rename from third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-expected.txt
rename to third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource-expected.txt
index a69b64e..08dbd90 100644
--- a/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-expected.txt
+++ b/third_party/blink/web_tests/platform/generic/http/tests/inspector-protocol/network/blocked-setcookie-same-site-strict-js-subresource-expected.txt
@@ -1,4 +1,4 @@
-Verifies that making cross origin requests which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+Verifies that making cross origin subresource requests from JS which set SameSite=Strict cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
 
 Javascript initiated subresource blocked set-cookies:[
     [0] : {
@@ -24,8 +24,4 @@
         cookieLine : name=value; SameSite=Strict
     }
 ]
-Javascript initiated navigation blocked set-cookies:[
-]
-Browser initiated navigation blocked set-cookies:[
-]
 
diff --git a/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-party-expected.txt b/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-party-expected.txt
deleted file mode 100644
index b37fe9e0..0000000
--- a/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-party-expected.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Verifies that making cross-party requests with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.
-
-Browser initiated navigation associated cookies:[
-    [0] : {
-        blockedReasons : [
-        ]
-        cookie : {
-            domain : cookie.test
-            expires : -1
-            httpOnly : false
-            name : name
-            path : /inspector-protocol/network/resources
-            priority : Medium
-            sameParty : true
-            sameSite : None
-            secure : true
-            session : true
-            size : 9
-            sourcePort : 8443
-            sourceScheme : Secure
-            value : value
-        }
-    }
-]
-Javascript initiated navigation associated cookies:[
-    [0] : {
-        blockedReasons : [
-        ]
-        cookie : {
-            domain : cookie.test
-            expires : -1
-            httpOnly : false
-            name : name
-            path : /inspector-protocol/network/resources
-            priority : Medium
-            sameParty : true
-            sameSite : None
-            secure : true
-            session : true
-            size : 9
-            sourcePort : 8443
-            sourceScheme : Secure
-            value : value
-        }
-    }
-]
-Javascript initiated subresource associated cookies:[
-    [0] : {
-        blockedReasons : [
-            [0] : SamePartyFromCrossPartyContext
-        ]
-        cookie : {
-            domain : cookie.test
-            expires : -1
-            httpOnly : false
-            name : name
-            path : /inspector-protocol/network/resources
-            priority : Medium
-            sameParty : true
-            sameSite : None
-            secure : true
-            session : true
-            size : 9
-            sourcePort : 8443
-            sourceScheme : Secure
-            value : value
-        }
-    }
-]
-
diff --git a/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource-expected.txt b/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource-expected.txt
new file mode 100644
index 0000000..e0a6a72
--- /dev/null
+++ b/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-cookie-same-party-js-subresource-expected.txt
@@ -0,0 +1,26 @@
+Verifies that making cross-party subresource requests from JS with SameParty cookies sends us Network.RequestWillBeSentExtraInfo events with corresponding associated cookies.
+
+Javascript initiated subresource associated cookies:[
+    [0] : {
+        blockedReasons : [
+            [0] : SamePartyFromCrossPartyContext
+        ]
+        cookie : {
+            domain : cookie.test
+            expires : -1
+            httpOnly : false
+            name : name
+            path : /inspector-protocol/network/resources
+            priority : Medium
+            sameParty : true
+            sameSite : None
+            secure : true
+            session : true
+            size : 9
+            sourcePort : 8443
+            sourceScheme : Secure
+            value : value
+        }
+    }
+]
+
diff --git a/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-expected.txt b/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource-expected.txt
similarity index 71%
rename from third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-expected.txt
rename to third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource-expected.txt
index bff6a11..759399f 100644
--- a/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-expected.txt
+++ b/third_party/blink/web_tests/platform/generic/virtual/first-party-sets/http/tests/inspector-protocol/network/blocked-setcookie-same-party-cross-party-js-subresource-expected.txt
@@ -1,4 +1,4 @@
-Verifies that making cross-party requests which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
+Verifies that making cross-party subresource requests from JS which set SameParty cookies send us Network.ResponseReceivedExtraInfo events with corresponding blocked set-cookies.
 
 Javascript initiated subresource blocked set-cookies:[
     [0] : {
@@ -24,8 +24,4 @@
         cookieLine : name=value; SameSite=None; SameParty; Secure
     }
 ]
-Javascript initiated navigation blocked set-cookies:[
-]
-Browser initiated navigation blocked set-cookies:[
-]