| commit | 07610a642bf1546525f671bf56d4aa9def38858c | [log] [tgz] |
|---|---|---|
| author | Ryan Tarpine <[email protected]> | Thu Jan 16 18:09:29 2025 |
| committer | Chromium LUCI CQ <[email protected]> | Thu Jan 16 18:09:29 2025 |
| tree | e7831a8a4b2c8b55c86a817c425faf7167e7dae8 | |
| parent | 98bd30ed9279bfa1703a54fbede1cf8baa0773f3 [diff] [blame] |
Reland "[DIPS] Rename DIPS prefix to Btm." This reverts commit f8849ddbca72aa0b830b17fb5af3f7b3ac0f3385. Reason for revert: Fixed bad merge with crrev.com/c/6174062 Original change's description: > Revert "[DIPS] Rename DIPS prefix to Btm." > > This reverts commit 4d4b33ce5cf2e18c6f2b2a120b2a8064db75c351. > > Reason for revert: Tree closure for compile failure > > Original change's description: > > [DIPS] Rename DIPS prefix to Btm. > > > > This makes it match the external name (Bounce Tracking Mitigations) and > > comply with the C++ style guide, which says "prefer to capitalize > > abbreviations as single words". > > > > A followup CL will rename filename prefixes from dips_ to btm_ (and the > > directories from dips/ to btm/). > > > > Bug: 388538934 > > Change-Id: I43d3f1c24632919ac8985aea5b7f2d945d2a9628 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6172859 > > Owners-Override: Avi Drissman <[email protected]> > > Commit-Queue: Ryan Tarpine <[email protected]> > > Reviewed-by: Avi Drissman <[email protected]> > > Cr-Commit-Position: refs/heads/main@{#1406975} > > Bug: 388538934 > Change-Id: Ic86e19c9c3a23d7dcb014bab5bc6bc13419a0ae0 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6173773 > Bot-Commit: Rubber Stamper <[email protected]> > Auto-Submit: Joey Arhar <[email protected]> > Owners-Override: Joey Arhar <[email protected]> > Commit-Queue: Joey Arhar <[email protected]> > Cr-Commit-Position: refs/heads/main@{#1406979} Bug: 388538934 Change-Id: I9a269534fb7bd8b35dc721ed7e2b851d248133eb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6180157 Owners-Override: Avi Drissman <[email protected]> Reviewed-by: Avi Drissman <[email protected]> Commit-Queue: Ryan Tarpine <[email protected]> Cr-Commit-Position: refs/heads/main@{#1407417}
diff --git a/chrome/browser/devtools/protocol/system_info_handler.cc b/chrome/browser/devtools/protocol/system_info_handler.cc index bcbb1449..714ce837 100644 --- a/chrome/browser/devtools/protocol/system_info_handler.cc +++ b/chrome/browser/devtools/protocol/system_info_handler.cc
@@ -19,10 +19,10 @@ const std::string& in_featureState, bool* featureEnabled) { if (in_featureState == "DIPS") { - *featureEnabled = base::FeatureList::IsEnabled(features::kDIPS) && - features::kDIPSDeletionEnabled.Get() && - (features::kDIPSTriggeringAction.Get() != - content::DIPSTriggeringAction::kNone); + *featureEnabled = base::FeatureList::IsEnabled(features::kBtm) && + features::kBtmDeletionEnabled.Get() && + (features::kBtmTriggeringAction.Get() != + content::BtmTriggeringAction::kNone); return protocol::Response::Success(); }