Fix problem where HTTPSE toggle doesn't work (always upgrades)

[bsclifton]

Fixes brave/brave-browser#9099
Unfixes brave/brave-browser#4381

Introduced via #4537

---

Revert "Merge pull request #4537 from jonathanKingston/bug-4381"

This reverts commit 86bf5ed, reversing
changes made to affeac4.

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)
• Ran git rebase master (if needed).
• Ran git rebase -i to squash commits (if needed).
• Tagged reviewers and labelled the pull request as needed.
• Request a security/privacy review as needed.
• Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone
• 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:

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.

[bsclifton]

It's possible the behavior described by brave/brave-browser#4381 is preferred; if that's the case we can always un-revert this once we have a way to address the UI.

Problem being reported via brave/brave-browser#9099 is that https upgrades still occur after turning shields off / turning off upgrades via toggle.

[bsclifton]

Used the build-bisect.py script to find this. First build containing the problem was 1.6.35; 1.6.32 was OK

[fmarier]

Introduced via #4314

Am I missing something or is this wrong?

It seems like this has nothing to do with DoH and you don't appear to be reverting that PR either.

[bsclifton]

oh shoot- sorry, I copy/pasted wrong one there :( Meant to link #4537

Per our Slack conversation, this is not actually a bug 😄 I'll go ahead and close this PR and we can leave notes in original issue