-
Notifications
You must be signed in to change notification settings - Fork 877
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move cookie list override logic to account for uninitialized preferences #11730
Merged
Conversation
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
emerick
approved these changes
Jan 4, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just had one minor comment - up to you if you make that change, though.
components/brave_shields/browser/ad_block_regional_service_manager.cc
Outdated
Show resolved
Hide resolved
The previous implementation only iterated through lists that existed in the preferences already, so in practice it would only override lists that had `enabled: false` - i.e. lists that had been enabled and disabled again before the "touched" preference was introduced. This fix clones the preferences dictionary and adds the cookie list with `enabled: true` to the cloned dictionary if the override should occur.
antonok-edm
force-pushed
the
cookielist-default-hotfix
branch
from
January 4, 2022 02:59
0122153
to
ccef18a
Compare
Android CI failure is unrelated, merging. |
Verified
Followed the testplan from #11621. Steps:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous implementation only iterated through lists that existed in the preferences already, so in practice it would only override lists that had
enabled: false
- i.e. lists that had been enabled and disabled again before the "touched" preference was introduced.This fix clones the preferences dictionary and adds the cookie list with
enabled: true
to the cloned dictionary if the override should occur.Resolves brave/brave-browser#20308
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
,npm run lint
,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan:
Same as #11621