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.

Sign up for GitHub

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

Jump to bottom

Upgrade from Chromium 103 to Chromium 104 (uplift to 1.42.x). #14317

Merged
merged 3 commits into from
Jul 26, 2022
Merged

Upgrade from Chromium 103 to Chromium 104 (uplift to 1.42.x). #14317

merged 3 commits into from
Jul 26, 2022

Conversation

mkarolin
Copy link
Collaborator

Fixes brave/brave-browser#23092
Fixes brave/brave-browser#22922

Uplift from #13498

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
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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:

@mkarolin mkarolin added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-upstream-tests labels Jul 25, 2022
@mkarolin mkarolin requested a review from a team as a code owner July 25, 2022 14:22
@mkarolin mkarolin self-assigned this Jul 25, 2022
mkarolin and others added 3 commits July 25, 2022 14:43
@mkarolin
Merge pull request #13498 from brave/cr104
50aa7e9 
Upgrade from Chromium 103 to Chromium 104.
@mkarolin
Removed permissions_policy_feature.mojom chromium_src override.
be9297a 
This file was added in the cr104 bump as a replacement for the patch.
The Brave PR that needs the patch/override has not been uplifted to
1.42.x, so this override is not needed.
@mkarolin
Additional fixes for base::DictionaryValue.
c831529
@kjozwiak kjozwiak added this to the 1.42.x - Beta milestone Jul 26, 2022
kjozwiak
kjozwiak approved these changes Jul 26, 2022
View reviewed changes
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.42.x approved 👍

@kjozwiak kjozwiak merged commit 2d4712a into 1.42.x Jul 26, 2022
@kjozwiak kjozwiak deleted the cr104-1.42.x branch July 26, 2022 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@mkarolin mkarolin

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit
Projects
None yet
Milestone
1.42.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@mkarolin @kjozwiak