Explicitly cancel blocked requests (attempt 2)

[bsclifton]

Manual re-opening of #6632

This was merged and then reverted with #7028
Fixes brave/brave-browser#10063

---

This reverts commit 12ea1cd, reversing
changes made to fbce153.

---

Submitter Checklist:

• Submitted a ticket for my issue if one did not already exist.
• Used Github auto-closing keywords in the commit message.
• Added/updated tests for this change (for new code or code which already has tests).
• Verified that these changes build without errors on
  • Android
  • iOS
  • Linux
  • macOS
  • Windows
• Verified that these changes pass automated tests (unit, browser, security tests) on
  • iOS
  • Linux
  • macOS
  • Windows
• Verified that all lint errors/warnings are resolved (npm run lint, npm run gn_check)
• Ran git rebase master (if needed).
• Ran git rebase -i to squash commits (if needed).
• Tagged reviewers and labelled the pull request as needed.
• Requested a security/privacy review as needed.
• Added appropriate QA labels (QA/Yes or QA/No) to the associated issue
• Added appropriate release note labels (release-notes/include or release-notes/exclude) to the associated issue
• Public documentation has been updated as necessary. For instance:
  • https://github.com/brave/brave-browser/wiki/Deviations-from-Chromium-(features-we-disable-or-remove)
  • https://github.com/brave/brave-browser/wiki/Proxy-redirected-URLs
  • https://github.com/brave/brave-browser/wiki/Fingerprinting-Protections
  • https://github.com/brave/brave-browser/wiki/Brave%E2%80%99s-Use-of-Referral-Codes
  • https://github.com/brave/brave-browser/wiki/Custom-Headers
  • https://github.com/brave/brave-browser/wiki/Web-compatibility-issues-with-tracking-protection
  • https://github.com/brave/brave-browser/wiki/QA-Guide

Test Plan:

The below pages have all been observed to crash with OOM errors about 20 seconds after loading without this change, but should not crash once this change is in place:

• https://www.laredmaspoderosa.com/
• https://www.ilt.edu/
• https://www.hippie-chay.de/
• https://www.wix.com/blog/2016/03/wix-websites-examples/
• https://www.thegivingblock.com/

Reviewer Checklist:

• New files have MPL-2.0 license header.
• Request a security/privacy review as needed.
• Adequate test coverage exists to prevent regressions
• Verify test plan is specified in PR before merging to source

After-merge Checklist:

• The associated issue milestone is set to the smallest version that the
  changes has landed on.
• All relevant documentation has been updated.

[antonok-edm]

I also updated the adblocking tests to use the more modern EvalJs instead of ExecuteScriptAndExtractBool, which made it a little easier to debug.

[antonok-edm]

@bsclifton I just had to change net::ERR_ABORTED to net::ERR_BLOCKED_BY_CLIENT. The 4 test failures were occurring because the XMLHttpRequests were having their onabort handlers triggered instead of onerror.

[bsclifton]

Very nice 😄👍

[antonok-edm]

These tests had to be updated as well, since they also use the blocking.html test page:

PerfPredictorTabHelperTest.NoBlockNoSavings
PerfPredictorTabHelperTest.ScriptBlockHasSavings
PerfPredictorTabHelperTest.NewNavigationStoresSavings

[bsclifton]

cc: @iefremov for re-review 😄

Was originally approved in PR by @spinda but full CI didn't run since it was in a fork

[iefremov]

Thanks for fixing the tests!

@bsclifton I just had to change net::ERR_ABORTED to net::ERR_BLOCKED_BY_CLIENT. The 4 test failures were occurring because the XMLHttpRequests were having their onabort handlers triggered instead of onerror.

Wondering, does this change (from onabort to onerror) bring any potential webcompat risks?

[antonok-edm]

Wondering, does this change (from onabort to onerror) bring any potential webcompat risks?

@iefremov webcompat was the motivating reason behind this change actually. Adblocking extensions only have the ability to do net::ERR_BLOCKED_BY_CLIENT, so they design their adblock lists and scriptlets accordingly. We've run into a handful of issues where the difference makes us less compatible, given that we're using the same rules as uBlock Origin.

[antonok-edm]

@bsclifton anything left blocking this, or can we merge?

[antonok-edm]

CI failures are known, merging.

[kjozwiak]

Verification PASSED on macOS 10.15.7 x64 using the following build:

Brave | 1.18.46 Chromium: 87.0.4280.49 (Official Build) unknown (x86_64)
-- | --
Revision | f77f85899646b42a1d3c8ff36794e00becab9171-refs/branch-heads/4280@{#1115}
OS | macOS Version 10.15.7 (Build 19H2)

• Verified the STR/Cases via Explicitly cancel blocked requests (attempt 2) #7030 (comment) and ensured Brave doesn't crash.

Verification PASSED on Samsung S10+ on Android 10 using 1.18.46 CR: 87.0.4280.49

• Verified the STR/Cases via Explicitly cancel blocked requests (attempt 2) #7030 (comment) and ensured Brave doesn't crash.