Skip to content
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

Match the default 1p blocking policy shipped by Griffin #14340

Merged
merged 1 commit into from
Jul 28, 2022

Conversation

antonok-edm
Copy link
Collaborator

Resolves brave/brave-browser#24281

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@antonok-edm antonok-edm self-assigned this Jul 26, 2022
@antonok-edm antonok-edm force-pushed the match-default-1p-blocking-griffin branch from 4f794af to 1126255 Compare July 27, 2022 18:00
@antonok-edm antonok-edm force-pushed the match-default-1p-blocking-griffin branch from 1126255 to 4effc7d Compare July 27, 2022 20:16
@antonok-edm antonok-edm merged commit 15ece28 into master Jul 28, 2022
@antonok-edm antonok-edm deleted the match-default-1p-blocking-griffin branch July 28, 2022 16:46
@github-actions github-actions bot added this to the 1.44.x - Nightly milestone Jul 28, 2022
@@ -92,6 +92,11 @@ AdBlockServiceTest::~AdBlockServiceTest() {}
void AdBlockServiceTest::SetUpOnMainThread() {
ExtensionBrowserTest::SetUpOnMainThread();
host_resolver()->AddRule("*", "127.0.0.1");
// Most tests are written for aggressive mode. Individual tests should reset
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not a good idea to override the default behavior like this, especially since this is commonly subclassed and this behavior will not be intuitive. Maybe you should split this into AdblockServiceTest and AdblockServiceAggressiveModeTest ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I do it this way is because aggressive mode more closely matches the behavior of uBlock Origin, AdGuard, etc. which is what our upstream lists are primarily targeting; standard mode has some specific modifications to that behavior but it ultimately makes things more complicated.

Maybe you should split this into AdblockServiceTest and AdblockServiceAggressiveModeTest?

That does sound reasonable, although I still believe most subclasses should be hooking from the aggressive version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants