Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[merge-101] Add new experiment configuration for Attribution Reporting
This CL introduces a new RTE trial feature which enabled Attribution Reporting, Fledge, and Topics. With this change multiple RTE features will use the same OT trial name, however we want to ensure they can still be individually enabled/ disabled via feature specific base::Features. We add new logic to further restrict what features can be registered from a given trial name for this reason. In order for the pre-existing Fledge and Topics RTEF to work correctly with the origin trial infrastructure, we remove their base::Features mappings, and introduce a new base::Feature PrivacySandboxAdStackOverride which allows force enabling via flags. A separate override about:flag is enabled which overrides the RTE features and ensures that privacy sandbox settings are skipped to allow for local testing with the new experiment configuration (which would otherwise not be possible). Note: With this new experiment config, Attribution Reporting will no longer be using a user subset exclusion origin trial, so corresponding tests are removed. (cherry picked from commit 1d6e4b5) Bug: 1309791 Change-Id: I00dfde8c6154accfbc88d96dfffdcba702edca83 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3527133 Reviewed-by: Josh Karlin <jkarlin@chromium.org> Reviewed-by: Jeremy Roman <jbroman@chromium.org> Reviewed-by: Russ Hamilton <behamilton@google.com> Reviewed-by: Michael Thiessen <mthiesse@chromium.org> Reviewed-by: Paul Jensen <pauljensen@chromium.org> Reviewed-by: Theodore Olsauskas-Warren <sauski@google.com> Reviewed-by: Andrew Paseltiner <apaseltiner@chromium.org> Reviewed-by: Yao Xiao <yaoxia@chromium.org> Reviewed-by: Ian Clelland <iclelland@chromium.org> Reviewed-by: Dominic Farolino <dom@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Commit-Queue: John Delaney <johnidel@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#985142} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3554848 Owners-Override: Prudhvikumar Bommana <pbommana@google.com> Cr-Commit-Position: refs/branch-heads/4951@{#183} Cr-Branched-From: 27de622-refs/heads/main@{#982481}
- Loading branch information
John Delaney
authored and
Chromium LUCI CQ
committed
Mar 28, 2022
1 parent
015a1c4
commit ad6baed
Showing
46 changed files
with
453 additions
and
315 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 0 additions & 118 deletions
118
chrome/browser/attribution_reporting/conversions_usage_restriction_trial_browsertest.cc
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.