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

Tie domain blocking to cosmetic filtering instead of ad blocking #8511

Merged
merged 2 commits into from
Apr 13, 2021

Conversation

pilgrim-brave
Copy link
Contributor

@pilgrim-brave pilgrim-brave commented Apr 12, 2021

Resolves brave/brave-browser#15242

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
  • 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:

@pilgrim-brave pilgrim-brave force-pushed the mpilgrim_fix_domain_blocking_aggressive branch from be1db5b to db2812d Compare April 13, 2021 15:15
@pilgrim-brave pilgrim-brave merged commit 5a986a1 into master Apr 13, 2021
@pilgrim-brave pilgrim-brave deleted the mpilgrim_fix_domain_blocking_aggressive branch April 13, 2021 15:16
@kjozwiak kjozwiak added this to the 1.25.x - Nightly milestone Apr 13, 2021
@kjozwiak
Copy link
Member

Verification PASSED on Win 10 x64 using the following build:

Brave | 1.25.16 Chromium: 90.0.4430.70 (Official Build) nightly (64-bit)
-- | --
Revision | 3954de7175366f3b7edca576f140dfa273e6b5ae-refs/branch-heads/4430@{#1210}
OS | Windows 10 OS Version 2009 (Build 19042.906)
  • ensured that --force-fieldtrials="*BraveDomainBlockStudy/Disabled/ wasn't being pulled/used by Griffen by checking brave://version/?show-variations-cmd
Initial Launch Restarted Several Times
initialLaunch relaunch

Used checked 1-1ads.com, actionsplash.com & pub.chez.com for the following cases:

  • ensured that selecting Trackers & ads blocked (aggressive) correctly enabled Top Level Domain blocking and displayed the expected interstitial page
  • ensured that setting Trackers & ads blocked (aggressive) via brave://settings/shields worked without any issues
  • ensured that selecting Trackers & ads blocked (standard) disabled Top Level Domain blocking and didn't display the interstitial page
  • ensured that selecting Allow trackers & ads blocked disabled Top Level Domain blocking and didn't display the interstitial page
Disabled Disabled Disabled
noneAggressive1 noneAggressive2 noneAggressive3
Enabled Enabled Enabled
aggressiveEnabled1 aggressiveEnabled2 aggressiveEnabled3

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

Successfully merging this pull request may close these issues.

top level domain blocking enabled with Standard blocking - follow up to #15095
4 participants