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

Upgrade from Chromium 83 to Chromium 84 #5679

Merged
merged 121 commits into from
Jul 2, 2020
Merged

Upgrade from Chromium 83 to Chromium 84 #5679

merged 121 commits into from
Jul 2, 2020

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented May 27, 2020

Fixes brave/brave-browser#10364
Fixes brave/brave-browser#8365
Related PR: brave/brave-browser#10363

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 force-pushed the cr84 branch 2 times, most recently from 2914248 to 92687fa Compare June 1, 2020 19:00
@mkarolin mkarolin force-pushed the cr84 branch 2 times, most recently from 204a4aa to fd4dbfa Compare June 10, 2020 03:25
@samartnik samartnik force-pushed the cr84 branch 2 times, most recently from 532e4e4 to 1144b48 Compare June 11, 2020 22:30
@mkarolin mkarolin force-pushed the cr84 branch 2 times, most recently from d22f16d to f960e7a Compare June 17, 2020 20:04
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label Jun 18, 2020
@mkarolin
Copy link
Collaborator Author

mkarolin commented Jun 19, 2020

@jumde updated BraveUpdateClientConfig here e1681f618360809c6c696eee683ed52861f332f5 to inherit from ChromeUpdateClientConfig instead of copying the entire ChromeUpdateClientConfig functionality. Any reason not to do this?

@mkarolin mkarolin force-pushed the cr84 branch 2 times, most recently from ad24949 to 1a40478 Compare June 25, 2020 17:11
@mkarolin mkarolin marked this pull request as ready for review June 25, 2020 17:13
@mkarolin mkarolin requested a review from jumde June 25, 2020 18:16
Copy link
Contributor

@NejcZdovc NejcZdovc left a comment

Choose a reason for hiding this comment

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

rewards code looks good

Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

LGTM

@mkarolin mkarolin force-pushed the cr84 branch 2 times, most recently from cbd48e6 to c3ee055 Compare June 26, 2020 03:42
@mkarolin mkarolin added the CI/skip Do not run CI builds (except noplatform) label Jun 26, 2020
mkarolin and others added 16 commits July 1, 2020 18:12
brave_clear_browsing_data_dialog_behavior is included as straight .js, not generated
Items in these sections are contained in brave's get started section. These sections were re-introduced with chromium 84
The version of clang included with Xcode (as high as XCode 11.4.1)
doesn't recognize #pragma clang max_tokens_here.

The pragma was added to clang here:
https://reviews.llvm.org/rG739b410f1ff51d507830774320c2db3a80d8610d

The Chromium change that started using it:

https://chromium.googlesource.com/chromium/src/+/b3e433a31194beb54e70acceba9401f47c74fc7d

commit b3e433a31194beb54e70acceba9401f47c74fc7d
Author: Hans Wennborg <hans@chromium.org>
Date:   Tue Apr 21 11:21:40 2020 +0000

    [base] Reduce the size of base/debug/alias.h significantly.

    This is a very widely included header, with
    ca 11,000 transitive includes for the 'chrome' target
    in Linux debug builds.

    Despite providing very basic functionality, its size
    was a whopping 480,000 tokens after pre-processing.
    This change brings the size down to 130 tokens on
    Linux.

    Bug: 242216
Addresses code review suggestions

Chromium change:

https://chromium.googlesource.com/chromium/src/+/204335845d2b7292bb99cb880203b7d132ddfa72

commit 204335845d2b7292bb99cb880203b7d132ddfa72
Author: Colin Blundell <blundell@chromium.org>
Date:   Wed Apr 15 08:52:29 2020 +0000

    [Android] Componentize InterceptNavigationDelegateImpl

    After preceding CLs this class has no remaining //chrome dependencies
    other than resources, which this CL componentizes along with the class
    itself. As this implementation of InterceptNavigationDelegate is
    specific to the overall intent launching logic in
    //components/external_intents, this CL componentizes it into that
    component. Componentizing this class will enable it to be reused in
    WebLayer.

    Bug: 1031465
As per code review suggestions
Manually moved to BraveNewTabPageLayout as NewTabPageView was removed
@mkarolin
Copy link
Collaborator Author

mkarolin commented Jul 2, 2020

CI: only errors are in audit_deps, unrelated to the PR.

@mkarolin mkarolin merged commit 2da6765 into master Jul 2, 2020
@mkarolin mkarolin deleted the cr84 branch July 2, 2020 01:07
@mkarolin
Copy link
Collaborator Author

mkarolin commented Jul 2, 2020

When uplifting, also uplift:

Pre cr84 merge:
#5969

Post cr84 merge
#5951
#5985
#6004
#5795
brave/brave-browser#10560
#6008
#6011
#6024
#6023

mkarolin added a commit that referenced this pull request Jul 2, 2020
Upgrade from Chromium 83 to Chromium 84
mkarolin added a commit that referenced this pull request Jul 7, 2020
Upgrade from Chromium 83 to Chromium 84
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
9 participants