Update trustedBiddingSignalsUrl to trustedBiddingSignalsURL
Bug: 1432707
Change-Id: I5bae7dace83033cec5c40587bb3e5655ead350c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4796230
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Caleb Raitto <caraitto@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Tianyang Xu <xtlsheep@google.com>
Cr-Commit-Position: refs/heads/main@{#1188614}
diff --git a/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js b/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
index 7e3062e..7dff97a 100644
--- a/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
+++ b/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
@@ -265,31 +265,31 @@
executionMode: 'unknownValuesAreValid' }
},
- // "trustedBiddingSignalsUrl" tests
+ // "trustedBiddingSignalsURL" tests
{ expectJoinSucces: true,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- trustedBiddingSignalsUrl: null }
+ trustedBiddingSignalsURL: null }
},
{ expectJoinSucces: false,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- trustedBiddingSignalsUrl: 'https://{{hosts[][www]}}/foo.js' }
+ trustedBiddingSignalsURL: 'https://{{hosts[][www]}}/foo.js' }
},
{ expectJoinSucces: false,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- trustedBiddingSignalsUrl: 'data:application/json,{}' }
+ trustedBiddingSignalsURL: 'data:application/json,{}' }
},
{ expectJoinSucces: true,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- trustedBiddingSignalsUrl: `${window.location.origin}/foo.js`}
+ trustedBiddingSignalsURL: `${window.location.origin}/foo.js`}
},
{ expectJoinSucces: true,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- trustedBiddingSignalsUrl: 'relative/path' }
+ trustedBiddingSignalsURL: 'relative/path' }
},
// "trustedBiddingSignalsKeys" tests
diff --git a/fledge/tentative/trusted-bidding-signals.https.sub.window.js b/fledge/tentative/trusted-bidding-signals.https.sub.window.js
index 7f34e4c..4a16d75 100644
--- a/fledge/tentative/trusted-bidding-signals.https.sub.window.js
+++ b/fledge/tentative/trusted-bidding-signals.https.sub.window.js
@@ -66,109 +66,109 @@
promise_test(async test => {
await runTrustedBiddingSignalsTest(test, 'trustedBiddingSignals === null');
-}, 'No trustedBiddingSignalsKeys or trustedBiddingSignalsUrl.');
+}, 'No trustedBiddingSignalsKeys or trustedBiddingSignalsURL.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['numValue'] });
-}, 'trustedBiddingSignalsKeys but no trustedBiddingSignalsUrl.');
+}, 'trustedBiddingSignalsKeys but no trustedBiddingSignalsURL.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
- { trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'trustedBiddingSignalsUrl without trustedBiddingSignalsKeys.');
+ { trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
+}, 'trustedBiddingSignalsURL without trustedBiddingSignalsKeys.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['close-connection'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'trustedBiddingSignalsUrl closes the connection without sending anything.');
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
+}, 'trustedBiddingSignalsURL closes the connection without sending anything.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['http-error'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response is HTTP 404 error.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['no-content-type'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has no content-type.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['wrong-content-type'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has wrong content-type.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['ad-auction-not-allowed'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response does not allow fledge.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['bad-ad-auction-allowed'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has wrong Ad-Auction-Allowed header.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['no-ad-auction-allow'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has no Ad-Auction-Allowed header.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['replace-body:'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has no body.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['replace-body:Not JSON'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response is not JSON.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['replace-body:[]'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response is a JSON array.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals === null',
{ trustedBiddingSignalsKeys: ['replace-body:{JSON_keys_need_quotes: 1}'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response in invalid JSON object.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals["replace-body:{}"] === null',
{ trustedBiddingSignalsKeys: ['replace-body:{}'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has no keys object.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, `trustedBiddingSignals['replace-body:{"keys":{}}'] === null`,
{ trustedBiddingSignalsKeys: ['replace-body:{"keys":{}}'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has no keys.');
promise_test(async test => {
@@ -180,7 +180,7 @@
trustedBiddingSignals["length"] === null`,
{ trustedBiddingSignalsKeys:
['replace-body:{"keys":[1,2,3]}', "0", "1", "2", "length"],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response keys is incorrectly an array.');
promise_test(async test => {
@@ -189,28 +189,28 @@
`trustedBiddingSignals["wrong-value"] === null &&
trustedBiddingSignals["another-value"] === undefined`,
{ trustedBiddingSignalsKeys: ['wrong-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has key not in trustedBiddingSignalsKeys.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals["null-value"] === null',
{ trustedBiddingSignalsKeys: ['null-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has null value for key.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals["num-value"] === 1',
{ trustedBiddingSignalsKeys: ['num-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has a number value for key.');
promise_test(async test => {
await runTrustedBiddingSignalsTest(
test, 'trustedBiddingSignals["string-value"] === "1"',
{ trustedBiddingSignalsKeys: ['string-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has string value for key.');
promise_test(async test => {
@@ -218,7 +218,7 @@
test,
`JSON.stringify(trustedBiddingSignals["array-value"]) === '[1,"foo",null]'`,
{ trustedBiddingSignalsKeys: ['array-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has array value for key.');
promise_test(async test => {
@@ -228,7 +228,7 @@
trustedBiddingSignals["object-value"]["a"] === "b" &&
JSON.stringify(trustedBiddingSignals["object-value"]["c"]) === '["d"]'`,
{ trustedBiddingSignalsKeys: ['object-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has object value for key.');
promise_test(async test => {
@@ -236,7 +236,7 @@
test,
'trustedBiddingSignals[""] === "default value"',
{ trustedBiddingSignalsKeys: [''],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives empty string key.');
promise_test(async test => {
@@ -251,7 +251,7 @@
trustedBiddingSignals[""] === "default value"`,
{ trustedBiddingSignalsKeys: ['wrong-value', 'null-value', 'num-value',
'string-value', 'array-value', ''],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has multiple keys.');
promise_test(async test => {
@@ -259,7 +259,7 @@
test,
'trustedBiddingSignals["+%20 \x00?,3#&"] === "default value"',
{ trustedBiddingSignalsKeys: ['+%20 \x00?,3#&'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives escaped key.');
promise_test(async test => {
@@ -267,7 +267,7 @@
test,
'trustedBiddingSignals["\x00"] === "default value"',
{ trustedBiddingSignalsKeys: ['\x00'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives null key.');
promise_test(async test => {
@@ -275,7 +275,7 @@
test,
`trustedBiddingSignals["interest-group-names"] === '["${DEFAULT_INTEREST_GROUP_NAME}"]'`,
{ trustedBiddingSignalsKeys: ['interest-group-names'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives interest group name.');
promise_test(async test => {
@@ -286,7 +286,7 @@
`trustedBiddingSignals["interest-group-names"] === '["+%20 \\\\u0000?,3#&"]'`,
{ name: '+%20 \x00?,3#&',
trustedBiddingSignalsKeys: ['interest-group-names'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives escaped interest group name.');
promise_test(async test => {
@@ -295,7 +295,7 @@
`trustedBiddingSignals["interest-group-names"] === '[""]'`,
{ name: '',
trustedBiddingSignalsKeys: ['interest-group-names'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives empty interest group name.');
promise_test(async test => {
@@ -303,7 +303,7 @@
test,
`trustedBiddingSignals["hostname"] === "${window.location.hostname}"`,
{ trustedBiddingSignalsKeys: ['hostname'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals receives hostname field.');
/////////////////////////////////////////////////////////////////////////////
@@ -315,7 +315,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['num-value'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has no Data-Version.');
promise_test(async test => {
@@ -323,7 +323,7 @@
test,
'browserSignals.dataVersion === 3',
{ trustedBiddingSignalsKeys: ['data-version:3'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has numeric Data-Version.');
promise_test(async test => {
@@ -331,7 +331,7 @@
test,
'browserSignals.dataVersion === 0',
{ trustedBiddingSignalsKeys: ['data-version:0'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has min Data-Version.');
promise_test(async test => {
@@ -339,7 +339,7 @@
test,
'browserSignals.dataVersion === 4294967295',
{ trustedBiddingSignalsKeys: ['data-version:4294967295'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has max Data-Version.');
promise_test(async test => {
@@ -347,7 +347,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:4294967296'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has too large Data-Version.');
promise_test(async test => {
@@ -355,7 +355,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:03'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has Data-Version with leading 0.');
promise_test(async test => {
@@ -363,7 +363,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:-1'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has negative Data-Version.');
promise_test(async test => {
@@ -371,7 +371,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:1.3'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has decimal in Data-Version.');
promise_test(async test => {
@@ -379,7 +379,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:2 2'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has space in Data-Version.');
promise_test(async test => {
@@ -387,7 +387,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:0x4'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has hex Data-Version.');
promise_test(async test => {
@@ -395,7 +395,7 @@
test,
'browserSignals.dataVersion === 4',
{ name: 'data-version',
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response has Data-Version and no trustedBiddingSignalsKeys.');
promise_test(async test => {
@@ -403,7 +403,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response with Data-Version and empty body.');
promise_test(async test => {
@@ -411,7 +411,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:[]'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response with Data-Version and JSON array body.');
promise_test(async test => {
@@ -419,7 +419,7 @@
test,
'browserSignals.dataVersion === undefined',
{ trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:{} {}'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response with Data-Version and double JSON object body.');
promise_test(async test => {
@@ -427,5 +427,5 @@
test,
'browserSignals.dataVersion === 3',
{ trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:{"keys":5}'],
- trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+ trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
}, 'Trusted bidding signals response with Data-Version and invalid keys entry');
