Skip to content

Commit

Permalink
Rename renderUrl to renderURL
Browse files Browse the repository at this point in the history
This is to match standard naming conventions in the web platform.
Follow-up CLs will rename other *Url members of interest group and ad
auction configs.

Both naming conventions will need to be supported for a time, to allow
sites to transition. To further aid transitioning, for a given
dictionary field, if both the fooUrl and fooURL versions are provided,
no error will be issued if both versions have the same value.

For trusted scoring signals responses, don't check that fooUrl and
fooURL have the same value, since this is non-trivial with current
implementation. Furthermore, renaming the request header names must come
later, only once servers support the new names.

These are the sites that need to support the old and new names -- they
each have tests to ensure that both new and old names work:

1. joinAdInterestGroup() (in Blink)
2. Interest group updates
3. Interest groups passed to the bidder worklet
4. Browser signals passed to scoreAd(), reportResult, and reportWin()
5. Trusted signals (accepting both names in server response, pass both
   names to worklet scripts)

Bug: 1432707
Change-Id: I519d54e40ab66a5aeed28f4173b041c77a168cd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4508191
Reviewed-by: Russ Hamilton <behamilton@google.com>
Commit-Queue: Caleb Raitto <caraitto@chromium.org>
Reviewed-by: Giovanni Ortuno Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1146567}
  • Loading branch information
caraitto authored and Chromium LUCI CQ committed May 19, 2023
1 parent b2d3cda commit 94a8095
Show file tree
Hide file tree
Showing 32 changed files with 836 additions and 270 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void JoinInterestGroup(const content::ToRenderFrameHost& adapter,
trustedBiddingSignalsKeys: ['key1'],
userBiddingSignals: {some: 'json', data: {here: [1, 2, 3]}},
ads: [{
renderUrl: $4,
renderURL: $4,
metadata: {ad: 'metadata', here: [1, 2, 3]},
}],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6608,7 +6608,7 @@ IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestBrowserTest, FledgeAuctionScripts) {
biddingLogicUrl: $2,
userBiddingSignals: [],
ads: [{
renderUrl: 'https://example.com/render',
renderURL: 'https://example.com/render',
metadata: {ad: 'metadata', here: [1, 2, 3]}
}]
}, /*joinDurationSec=*/ 300);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class InterestGroupPermissionsBrowserTest : public InProcessBrowserTest {
trustedBiddingSignalsKeys: ['key1'],
userBiddingSignals: {some: 'json', data: {here: [1, 2, 3]}},
ads: [{
renderUrl: $4,
renderURL: $4,
metadata: {ad: 'metadata', here: [1, 2, 3]},
}],
},
Expand Down
192 changes: 137 additions & 55 deletions content/browser/interest_group/ad_auction_service_impl_unittest.cc

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions content/browser/interest_group/auction_runner_unittest.cc

Large diffs are not rendered by default.

0 comments on commit 94a8095

Please sign in to comment.