Fix 10528: Parse resource.json for regional adblock lists #5981
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
pes10k
approved these changes
Jun 30, 2020
There was a problem hiding this comment.
LGTM though @antonok-edm should probably take a glance too to make sure
antonok-edm
approved these changes
Jun 30, 2020
|
@jumde should this |
@antonok-edm - Good call, I'll remove. |
antonok-edm
reviewed
Jun 30, 2020
Comment on lines
145
to
146
| g_brave_browser_process->ad_block_regional_service_manager()->EnableTag( | ||
| tag, enabled); |
There was a problem hiding this comment.
@jumde I think you may have touched the wrong lines here
jumde
force-pushed
the
adblock_resource
branch
4 times, most recently
from
3b2b78c to
7c89392
Compare
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.
Resolves brave/brave-browser#10528
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Failed to parse JSON adblock resources: EOF while parsing a value at line 1 column 0is displayed.resource.jsonshould be added to all regional adblock lists by brave/brave-core-crx-packager#138Reviewer Checklist:
After-merge Checklist:
changes has landed on.