From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../test/browser/partitionedstorage_head.js             | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'toolkit/components/antitracking/test/browser/partitionedstorage_head.js')

diff --git a/toolkit/components/antitracking/test/browser/partitionedstorage_head.js b/toolkit/components/antitracking/test/browser/partitionedstorage_head.js
index d37b8177c4..15ba20fd68 100644
--- a/toolkit/components/antitracking/test/browser/partitionedstorage_head.js
+++ b/toolkit/components/antitracking/test/browser/partitionedstorage_head.js
@@ -141,6 +141,7 @@ this.PartitionedStorageHelper = {
       await SpecialPowers.pushPrefEnv({
         set: [
           ["dom.storage_access.enabled", true],
+          ["network.cookie.cookieBehavior.optInPartitioning", true],
           [
             "privacy.partition.always_partition_third_party_non_cookie_storage",
             true,
@@ -164,14 +165,14 @@ this.PartitionedStorageHelper = {
       }
 
       info("Creating the first tab");
-      let tab1 = BrowserTestUtils.addTab(win.gBrowser, TEST_TOP_PAGE);
+      let tab1 = BrowserTestUtils.addTab(win.gBrowser, TEST_TOP_PAGE_HTTPS);
       win.gBrowser.selectedTab = tab1;
 
       let browser1 = win.gBrowser.getBrowserForTab(tab1);
       await BrowserTestUtils.browserLoaded(browser1);
 
       info("Creating the second tab");
-      let tab2 = BrowserTestUtils.addTab(win.gBrowser, TEST_TOP_PAGE_6);
+      let tab2 = BrowserTestUtils.addTab(win.gBrowser, TEST_TOP_PAGE_9);
       win.gBrowser.selectedTab = tab2;
 
       let browser2 = win.gBrowser.getBrowserForTab(tab2);
@@ -180,7 +181,7 @@ this.PartitionedStorageHelper = {
       info("Creating the third tab");
       let tab3 = BrowserTestUtils.addTab(
         win.gBrowser,
-        TEST_4TH_PARTY_PARTITIONED_PAGE
+        TEST_4TH_PARTY_PARTITIONED_PAGE_HTTPS
       );
       win.gBrowser.selectedTab = tab3;
 
@@ -189,7 +190,7 @@ this.PartitionedStorageHelper = {
 
       // Use the same URL as first tab to check partitioned data
       info("Creating the forth tab");
-      let tab4 = BrowserTestUtils.addTab(win.gBrowser, TEST_TOP_PAGE);
+      let tab4 = BrowserTestUtils.addTab(win.gBrowser, TEST_TOP_PAGE_HTTPS);
       win.gBrowser.selectedTab = tab4;
 
       let browser4 = win.gBrowser.getBrowserForTab(tab4);
@@ -207,7 +208,8 @@ this.PartitionedStorageHelper = {
           browser,
           [
             {
-              page: TEST_4TH_PARTY_PARTITIONED_PAGE + "?variant=" + variant,
+              page:
+                TEST_4TH_PARTY_PARTITIONED_PAGE_HTTPS + "?variant=" + variant,
               getDataCallback: getDataCallback.toString(),
               result,
             },
@@ -289,7 +291,8 @@ this.PartitionedStorageHelper = {
           browser,
           [
             {
-              page: TEST_4TH_PARTY_PARTITIONED_PAGE + "?variant=" + variant,
+              page:
+                TEST_4TH_PARTY_PARTITIONED_PAGE_HTTPS + "?variant=" + variant,
               addDataCallback: addDataCallback.toString(),
               value,
             },
@@ -382,7 +385,7 @@ this.PartitionedStorageHelper = {
 
       async function setStorageAccessForThirdParty(browser) {
         info(`Setting permission for ${browser.currentURI.spec}`);
-        let type = "3rdPartyStorage^http://not-tracking.example.com";
+        let type = "3rdPartyStorage^https://not-tracking.example.com";
         let permission = Services.perms.ALLOW_ACTION;
         let expireType = Services.perms.EXPIRE_SESSION;
         Services.perms.addFromPrincipal(
-- 
cgit v1.2.3