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 81 to Chromium 83 #5102

Merged
merged 161 commits into from
May 26, 2020
Merged

Upgrade from Chromium 81 to Chromium 83 #5102

merged 161 commits into from
May 26, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Mar 30, 2020 •
edited
Loading

Fixes brave/brave-browser#9760
Related PR: brave/brave-browser#9765

Submitter Checklist:

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.

@mkarolin mkarolin added this to the 1.8.x - Nightly milestone Mar 30, 2020
@mkarolin mkarolin self-assigned this Mar 30, 2020
@mkarolin mkarolin force-pushed the cr83 branch 10 times, most recently from e6fc07e to bd19f33 Compare April 4, 2020 00:02
@mkarolin mkarolin force-pushed the cr83 branch 3 times, most recently from 718c0df to da484d7 Compare April 10, 2020 22:07
@mkarolin mkarolin mentioned this pull request Apr 13, 2020
Closed
@mkarolin mkarolin force-pushed the cr83 branch 9 times, most recently from 92ca0ea to 7bff69a Compare April 20, 2020 22:21
@mkarolin mkarolin force-pushed the cr83 branch 3 times, most recently from 93875fe to 67ec6f3 Compare April 22, 2020 22:02
samartnik and others added 15 commits May 26, 2020 10:02
@samartnik @mkarolin
[Android] Fixed crashes related to renaming
7380e81 
Caused by latest master pull to cr83
@mkarolin
Updated patches after rebase over master.
a26057d
@mkarolin
Dummy out AccountInfo.gaia
12e1c88
@mkarolin
Makes page_info/BUILD.gn patch more generic.
e02b4c7
@mkarolin
Lint fix.
8eedab0
@mkarolin
Restores a line accidentally removed by patching.
404085a
@samartnik @mkarolin
[Android] Additional fixes for crashes related to renaming
1d0394b 
Caused by latest master pull to cr83
@mkarolin
Make //build/config/compiler patch extensible.
9b068ae
@mkarolin
Patch doesn't need to remove a line.
78c6e75
@yrliou @mkarolin
Remove TorProfileServiceFactory::ServiceIsNULLWhileTesting override.
c780d77 
Will crash running BraveProfileManagerTest.ProxyConfigMonitorInTorProfile unit
test if we do not instantiate TorProfileService, because we will need
TorProfileService to create the proxy config service for Tor profile.
@mkarolin
Disable kAutofillEnableAccountWalletStorage feature.
ed72c03 
This feature was disabled by default in C81, but is enabled by default
in C83. It causes a crash when navigating to brave://settings/payments.

commit f8d01800e4c08fb9ed7af6a5446f14553a0e2c6e
Author: Jared Saul <[email protected]>
Date:   Mon Mar 23 22:53:41 2020 +0000

    [AF] Enable AutofillEnableAccountWalletStorage by default

    Also cleans up the fieldtrial_testing_config entry for the
    SyncButterWallet launch now that it's enabled ToT (and 100% launched).

    Per request, not going to clean up the code usage of the flag quite yet
    because Butter for Mobile may be coming in the near future.

    Bug: 983940
@mkarolin
Reverted single gn target for rust fixes.
9bd0985 
Doesn't seem to work for unit tests binary.
@petemill @mkarolin
Settings WebUI - Instead of patching content settings subsection navi…
7e26070 
…gation, use js overrides
@mkarolin
Removed chromium_src override that's no longer used.
4cc8ed0 
This was a leftover from the CreateCookie patches cleanup.
@mkarolin
Added missing dep
3a964ed
@mkarolin mkarolin removed CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS labels May 26, 2020
@samartnik
[Android] Updated definitions for resources
b348e37 
Related to recent master pull
@samartnik
[Android] Fixed build issues related to renaming
ac7ee82 
Caused by latest master pull to cr83
@mkarolin
Copy link
Collaborator Author

CI passed after a rebase: the only failure audit-network on Linux is a known one.

@bsclifton bsclifton merged commit 1cac237 into master May 26, 2020
@bsclifton bsclifton deleted the cr83 branch May 26, 2020 21:20
@mkarolin
Copy link
Collaborator Author

mkarolin commented May 27, 2020 •
edited by simonhong
Loading

When uplifting, also uplift fixes to:

@mkarolin mkarolin added this to the 1.11.x - Nightly milestone May 28, 2020
mkarolin pushed a commit that referenced this pull request Jun 4, 2020
@bsclifton @mkarolin
Merge pull request #5102 from brave/cr83
87b5c37 
Upgrade from Chromium 81 to Chromium 83
@mkarolin mkarolin mentioned this pull request Jun 4, 2020
Merged
32 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndriusA AndriusA AndriusA left review comments

@samartnik samartnik samartnik left review comments

@pilgrim-brave pilgrim-brave pilgrim-brave left review comments

@bridiver bridiver bridiver approved these changes

@fmarier fmarier fmarier approved these changes

@kylehickinson kylehickinson kylehickinson approved these changes

@NejcZdovc NejcZdovc NejcZdovc approved these changes

@darkdh darkdh darkdh approved these changes

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

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

@tmancey tmancey Awaiting requested review from tmancey

@yrliou yrliou Awaiting requested review from yrliou

@bsclifton bsclifton Awaiting requested review from bsclifton

Assignees

@mkarolin mkarolin

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

Successfully merging this pull request may close these issues.

Upgrade from Chromium 81 to Chromium 83