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

Updated patches from Chromium 87.0.4280.60 to Chromium 87.0.4280.66 (1.17.x). #7182

Merged
merged 2 commits into from
Nov 19, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Nov 18, 2020

Fixes brave/brave-browser#12727
Fixes brave/brave-browser#12741

Related PR: brave/brave-browser#12764

Uplift from #7158
Uplift from #7167

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • 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).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

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

bbondy and others added 2 commits November 18, 2020 09:48
Updated patches from Chromium 87.0.4280.60 to Chromium 87.0.4280.63.
Updated patches from Chromium 87.0.4280.63 to Chromium 87.0.4280.66.
@mkarolin
Copy link
Collaborator Author

CI failures:

  • Windows, Mac, and Linux:
 1 test crashed:
     BraveContentBrowserClientTest.RewriteChromeSync (../../brave/browser/brave_content_browser_client_browsertest.cc:215)

@kjozwiak kjozwiak added this to the 1.17.x - Release milestone Nov 18, 2020
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.17.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 5438146 into 1.17.x Nov 19, 2020
@kjozwiak kjozwiak deleted the 87.0.4280.66-1.17.x branch November 19, 2020 00:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
4 participants