-
Notifications
You must be signed in to change notification settings - Fork 869
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
Unrevert unified adblock catalog #21556
Conversation
723d39a
to
38c6794
Compare
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.
android tests ++
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.
rust++
We don't usually bump the copyright date for existing license headers, and one looks like it might be the result of a broken merge?
browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc
Outdated
Show resolved
Hide resolved
browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc
Outdated
Show resolved
Hide resolved
@@ -1,9 +1,9 @@ | |||
/* Copyright (c) 2019 The Brave Authors. All rights reserved. | |||
/* Copyright (c) 2023 The Brave Authors. All rights reserved. |
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.
this is technically a "new" file, although according to GitHub it's similar enough to the previous one that it's renamed instead. I'll keep the older copyright here too.
38c6794
to
60622cf
Compare
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.
Tested in iOS and everything is fine there. Code-wise too everything looks good to me.
[puLL-Merge] - brave/brave-core@21556 DescriptionThis PR removes the The motivation for this change seems to be to provide a more accurate and encompassing name according to the code now that the manager isn't solely responsible for regional adblock filters. ChangesChanges
|
37232aa
to
2dd357f
Compare
2dd357f
to
61424d0
Compare
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.
browser/net/* lgtm
Revert of #20442
(This reverts commit 4ad53ad, reversing changes made to ec922be.)
Unblocks brave/brave-browser#34275
Resolves brave/brave-browser#33621
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
wikinpm run lint
,npm run presubmit
wiki,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan:
Use the test plan from #19946 (comment)