Fixing nightly

[jumde]

Description

To revert C74, PR #2088 was merged unintentionally instead of #2079.

See more details here: https://bravesoftware.slack.com/archives/CA5FPHWLF/p1553697892501200?thread_ts=1553678935.487200&cid=CA5FPHWLF

Instead of re-reverting the original PR and pushing the new pr, @mihaiplesa and I worked on a PR that has the missing commits from #2079.

From #2079 :

Related: brave/brave-browser#3896

Reverts:
brave/brave-browser#3790
#2029
#2072

Fixes brave/brave-browser#3898

Unfixes:
brave/brave-browser#3502
brave/brave-browser#3662
brave/brave-browser#3816

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
  • Windows
  • macOS
  • Linux
• Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) on
  • Windows
  • macOS
  • Linux
• 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

Test Plan:

1. Go into Jenkins for this PR
2. Verify everything passes on all platforms
3. If anything fails, don't merge

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

[jumde]

PR builder passed here: https://staging.ci.brave.com/job/brave-browser-build-pr/job/test_nightly/2/
( the network-audit on mac failure is because of a known revert #3816)