Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 159 insertions, 12 deletions

diff --git a/testing/web-platform/meta/fledge/tentative/additional-bids.https.window.js.ini b/testing/web-platform/meta/fledge/tentative/additional-bids.https.window.js.ini
new file mode 100644
index 0000000000..a580ac5ebe
--- /dev/null
+++ b/testing/web-platform/meta/fledge/tentative/additional-bids.https.window.js.ini
@@ -0,0 +1,9 @@
+[additional-bids.https.window.html?1-last]
+  [single valid additional bid]
+    expected: FAIL
+
+  [two valid additional bids]
+    expected: FAIL
+
+  [two valid additional bids from two distinct Fetch requests]
+    expected: FAIL
diff --git a/testing/web-platform/meta/fledge/tentative/auction-config.https.window.js.ini b/testing/web-platform/meta/fledge/tentative/auction-config.https.window.js.ini
index 26f158cd67..32b7809f8c 100644
--- a/testing/web-platform/meta/fledge/tentative/auction-config.https.window.js.ini
+++ b/testing/web-platform/meta/fledge/tentative/auction-config.https.window.js.ini
@@ -135,6 +135,9 @@
   [allSlotsRequestedSizes has invalid value]
     expected: FAIL
 
+  [forDebuggingOnly lockout and cooldowns updating in one auction, read in another's.]
+    expected: FAIL
+
 
 [auction-config.https.window.html?26-30]
   [perBuyerCurrencies with non-https currency map key]
diff --git a/testing/web-platform/meta/fledge/tentative/generate-bid-browser-signals.https.window.js.ini b/testing/web-platform/meta/fledge/tentative/generate-bid-browser-signals.https.window.js.ini
new file mode 100644
index 0000000000..83366d750c
--- /dev/null
+++ b/testing/web-platform/meta/fledge/tentative/generate-bid-browser-signals.https.window.js.ini
@@ -0,0 +1,129 @@
+[generate-bid-browser-signals.https.window.html?1-last]
+  [Only expected fields present.]
+    expected: FAIL
+
+  [browserSignals.joinCount same joining page.]
+    expected: FAIL
+
+  [browserSignals.joinCount different top-level joining origin.]
+    expected: FAIL
+
+  [browserSignals.joinCount leave and rejoin.]
+    expected: FAIL
+
+  [Check recency in generateBid() is below a certain threshold and rounded to multiple of 100 milliseconds.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?17-last]
+  [browserSignals.wasmHelper.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?1-4]
+  [Only expected fields present.]
+    expected: FAIL
+
+  [browserSignals.joinCount same joining page.]
+    expected: FAIL
+
+  [browserSignals.joinCount different top-level joining origin.]
+    expected: FAIL
+
+  [browserSignals.joinCount leave and rejoin.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?5-8]
+  [Check recency in generateBid() is below a certain threshold and rounded to multiple of 100 milliseconds.]
+    expected: FAIL
+
+  [browserSignals.bidCount not incremented when ad not used.]
+    expected: FAIL
+
+  [browserSignals.bidCount incremented when ad used.]
+    expected: FAIL
+
+  [browserSignals.bidCount persists across re-join from other top-level origin.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?9-12]
+  [browserSignals.bidCount leave and rejoin.]
+    expected: FAIL
+
+  [browserSignals.bidCount two auctions at once.]
+    expected: FAIL
+
+  [browserSignals.bidCount incremented once when winning ad used twice.]
+    expected: FAIL
+
+  [browserSignals.bidCount incremented when another interest group wins.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?13-16]
+  [browserSignals.bidCount incremented when seller rejects bid.]
+    expected: FAIL
+
+  [browserSignals.bidCount incremented when seller throws.]
+    expected: FAIL
+
+  [browserSignals.bidCount not incremented when no bid.]
+    expected: FAIL
+
+  [browserSignals.bidCount not incremented when no bid and another interest group wins.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?17-20]
+  [browserSignals.bidCount incremented when makes largest bid, but seller rejects the bid.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs not affected when ad not used.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs, no metadata.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs, with metadata.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?21-24]
+  [browserSignals.prevWinsMs, different set of ads for each bid.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs persists across re-join from other top-level origin.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs leave and rejoin.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs two auctions at once.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?25-28]
+  [browserSignals.prevWinsMs has only one win when winning ad used twice.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs not updated when another interest group wins.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs not updated when seller rejects bid.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs not updated when seller throws.]
+    expected: FAIL
+
+
+[generate-bid-browser-signals.https.window.html?29-last]
+  [browserSignals.prevWinsMs not updated when no bid.]
+    expected: FAIL
+
+  [browserSignals.prevWinsMs not updated when makes largest bid, but another interest group wins.]
+    expected: FAIL
+
+  [browserSignals.wasmHelper.]
+    expected: FAIL
diff --git a/testing/web-platform/meta/fledge/tentative/generate-bid-recency.https.window.js.ini b/testing/web-platform/meta/fledge/tentative/generate-bid-recency.https.window.js.ini
deleted file mode 100644
index 8fc716e007..0000000000
--- a/testing/web-platform/meta/fledge/tentative/generate-bid-recency.https.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[generate-bid-recency.https.window.html]
-  [Check recency in generateBid() is below a certain threshold and rounded to multiple of 100 milliseconds.]
-    expected: FAIL
diff --git a/testing/web-platform/meta/fledge/tentative/join-leave-ad-interest-group.https.window.js.ini b/testing/web-platform/meta/fledge/tentative/join-leave-ad-interest-group.https.window.js.ini
index af5164cfcc..1afadb875e 100644
--- a/testing/web-platform/meta/fledge/tentative/join-leave-ad-interest-group.https.window.js.ini
+++ b/testing/web-platform/meta/fledge/tentative/join-leave-ad-interest-group.https.window.js.ini
@@ -52,13 +52,22 @@
   [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","biddingWasmHelperURL":"relative/path"}}]
     expected: FAIL
 
-  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","dailyUpdateUrl":null}}]
+  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":null}}]
     expected: FAIL
 
-  [Join and leave interest group: {"expectJoinSucces":false,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","dailyUpdateUrl":"https://{{hosts[\][www\]}}/foo.js"}}]
+  [Join and leave interest group: {"expectJoinSucces":false,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":"https://{{hosts[\][www\]}}/foo.js"}}]
     expected: FAIL
 
-  [Join and leave interest group: {"expectJoinSucces":false,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","dailyUpdateUrl":"data:application/wasm,Foo"}}]
+  [Join and leave interest group: {"expectJoinSucces":false,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":"data:application/wasm,Foo"}}]
+    expected: FAIL
+
+  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":null}}]
+    expected: FAIL
+
+  [Join and leave interest group: {"expectJoinSucces":false,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":"https://{{hosts[\][www\]}}/foo.js"}}]
+    expected: FAIL
+
+  [Join and leave interest group: {"expectJoinSucces":false,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":"data:application/wasm,Foo"}}]
     expected: FAIL
 
 
@@ -234,12 +243,6 @@
 
 
 [join-leave-ad-interest-group.https.window.html?41-50]
-  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","dailyUpdateUrl":"https://web-platform.test:8443/foo.js"}}]
-    expected: FAIL
-
-  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","dailyUpdateUrl":"relative/path"}}]
-    expected: FAIL
-
   [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","executionMode":"compatibility"}}]
     expected: FAIL
 
@@ -263,3 +266,9 @@
 
   [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","trustedBiddingSignalsURL":"relative/path"}}]
     expected: FAIL
+
+  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":"https://web-platform.test:8443/foo.js"}}]
+    expected: FAIL
+
+  [Join and leave interest group: {"expectJoinSucces":true,"expectLeaveSucces":true,"interestGroup":{"owner":"https://web-platform.test:8443","name":"default name","updateURL":"relative/path"}}]
+    expected: FAIL