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 92 to Chromium 93 (1.29.x). #9832

Merged
merged 15 commits into from
Aug 26, 2021
Merged

Upgrade from Chromium 92 to Chromium 93 (1.29.x). #9832

merged 15 commits into from
Aug 26, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Aug 23, 2021 •
edited
Loading

Fixes brave/brave-browser#16306 / Uplift from #9062
Fixes brave/brave-browser#17549 / Uplift from #9786
Fixes brave/brave-browser#17552 / Uplift from #9789
Fixes brave/brave-browser#17572 / Uplift from #9823
Fixes brave/brave-browser#17585 / Uplift from #9805
Fixes brave/brave-browser#17646 / Uplift from #9827
Fixes brave/brave-browser#17655 / Uplift from #9827
Fixes brave/brave-browser#17573 / Uplift from #9792
Fixes brave/brave-browser#17587 / Uplift from #9830
Fixes brave/brave-browser#17596 / Uplift from #9830
Fixes brave/brave-browser#17599 / Uplift from #9837
Fixes brave/brave-browser#17580 / Uplift from #9799
Fixes brave/brave-browser#17667 / Uplift from #9849
Fixes brave/brave-browser#17668 / Uplift from #9839
Fixes brave/brave-browser#17693 / Uplift from #9851
Fixes brave/brave-browser#17595 / Uplift from #9807
Fixes brave/brave-browser#17652 / Uplift from #9858

Note: The fix for brave/brave-browser#17654 (#9854) is not being uplifted to 1.29.x because the cause for the fix (#9545) was not uplifted to 1.29.x. QA: please, verify that brave/brave-browser#17654 is not present in 1.29.x.

Related PR: brave/brave-browser#17647

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
  • 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 the CI/run-network-audit Run network-audit label Aug 23, 2021
@mkarolin mkarolin self-assigned this Aug 23, 2021
@mkarolin mkarolin requested review from goodov, iefremov, samartnik and a team as code owners August 23, 2021 23:37
@mkarolin mkarolin requested review from deeppandya and zenparsing and removed request for a team August 23, 2021 23:37
@mkarolin mkarolin mentioned this pull request Aug 23, 2021
Merged
24 tasks
mkarolin and others added 5 commits August 23, 2021 20:51
@mkarolin
Merge pull request #9062 from brave/cr93
cbde231 
Upgrade from Chromium 92 to Chromium 93
@mkarolin
Merge pull request #9786 from brave/93.0.4577.51
51e145c 
Updated patches from Chromium 93.0.4577.42 to Chromium 93.0.4577.51.
@mkarolin
Merge pull request #9789 from brave/maxk-cr93fu-profile-picker-fix
371433f 
[cr93 followup] Fixes profile picker - hides "Set up" page.
@zenparsing @mkarolin
Merge pull request #9823 from brave/ksmith-rewards-ntp-grid
6a716a7 
Fix unclickable button on Rewards NTP widget
@mkarolin
Merge pull request #9805 from brave/maxk-cr93fu-guest-settings
53bd973 
[cr93 followup] Fixes brave://settings in Guest window.
bbondy and others added 4 commits August 23, 2021 21:16
@bbondy @mkarolin
Merge pull request #9827 from brave/usbDevices-permission-erc
644b8cd 
Give ethereum-remote-client permissions to usbDevices
@bsclifton @mkarolin
Merge pull request #9792 from brave/maxk-cr93fu-disable-kReadLater
f3e1998 
[cr93 followup] Disables kReadLater feature.
@samartnik @mkarolin
Merge pull request #9830 from brave/android_dark_theme_color_fixes
919a424 
[Android] Fixed colors for the dark theme
@samartnik @mkarolin
Merge pull request #9837 from brave/android_ntp_launch_fix
30d906b 
[Android] Fixed NTP launching on start up
@AlexeyBarabash
Copy link
Contributor

@mkarolin
Could you please also add this PR:
Fixes brave/brave-browser#17580 / Uplift from #9799
into the current cr93-1.29.x?

AlexeyBarabash and others added 2 commits August 25, 2021 09:51
@AlexeyBarabash @mkarolin
Merge pull request #9799 from brave/sync_cr93_fix_17580
9ce52e2 
Remove Chromium leftovers from sync types screen on Android
@simonhong @mkarolin
Merge pull request #9849 from brave/cr93_first_run_regression
063da13 
Fixed first-run dialog is not launched
@AlexeyBarabash
Copy link
Contributor

@mkarolin ,
I did tests regression with #9799 .

This is fixed by
brave/brave-browser#17693 / Uplift from #9851

Could you please upload #9851 also?

bsclifton and others added 4 commits August 25, 2021 13:34
@bsclifton @mkarolin
Merge pull request #9839 from brave/93.0.4577.58_master_116
69264e2 
Upgrade patches from Chromium 93.0.4577.51 to Chromium 93.0.4577.58
@AlexeyBarabash @mkarolin
Merge pull request #9851 from brave/fix_android_test_17693
72f50d6 
Fix tests on Android caused by regression PR9799
@bsclifton @mkarolin
Merge pull request #9807 from brave/maxk-cr93fu-enable-kEnablePasswor…
e059ea9 
…dsAccountStorage

[cr93 followup] Removed disablement of kEnablePasswordsAccountStorage.
@mkarolin
Merge pull request #9858 from brave/maxk-cr93fu-fix-webtorrent-crash
413acfc 
[cr93 followup] Fix for webtorrent crash.
@mkarolin mkarolin changed the title WIP: Upgrade from Chromium 92 to Chromium 93 (1.29.x). Upgrade from Chromium 92 to Chromium 93 (1.29.x). Aug 26, 2021
@mkarolin mkarolin requested a review from a team August 26, 2021 02:15
@kjozwiak kjozwiak added this to the 1.29.x - Beta milestone Aug 26, 2021
kjozwiak
kjozwiak approved these changes Aug 26, 2021
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.29.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit b13d4c7 into 1.29.x Aug 26, 2021
@kjozwiak kjozwiak deleted the cr93-1.29.x branch August 26, 2021 16:54
@kjozwiak kjozwiak mentioned this pull request Aug 27, 2021
Closed
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

@goodov goodov Awaiting requested review from goodov goodov is a code owner

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

@samartnik samartnik Awaiting requested review from samartnik samartnik is a code owner

@deeppandya deeppandya Awaiting requested review from deeppandya

@zenparsing zenparsing Awaiting requested review from zenparsing

Assignees

@mkarolin mkarolin

Labels
CI/run-network-audit Run network-audit
Projects
None yet
Milestone
1.29.x - Release
Development

Successfully merging this pull request may close these issues.
8 participants
@mkarolin @AlexeyBarabash @kjozwiak @zenparsing @bbondy @bsclifton @samartnik @simonhong