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 119 to Chromium 120. #20434

Merged
merged 110 commits into from
Nov 27, 2023
Merged

Upgrade from Chromium 119 to Chromium 120. #20434

merged 110 commits into from
Nov 27, 2023

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Oct 6, 2023

Resolves brave/brave-browser#33471

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • 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 wiki
    • npm run lint, npm run presubmit wiki, 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 Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) labels Oct 6, 2023
@github-actions github-actions bot added potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels Oct 6, 2023
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@cdesouza-chromium cdesouza-chromium force-pushed the cr120 branch 3 times, most recently from 946645e to adc3c71 Compare October 11, 2023 10:28
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@cdesouza-chromium cdesouza-chromium force-pushed the cr120 branch 2 times, most recently from 6d4036b to 47b69f2 Compare October 12, 2023 12:00
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

cdesouza-chromium and others added 15 commits November 27, 2023 11:31
@cdesouza-chromium @mkarolin
Fix PrivacySandboxSettings delegate mocking
1f969af 
Another astract function has been added on the delegate class, which
needs to be mocked in brave's test.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/4facaa830da1fbe990de7792a0028ed181d00795

commit 4facaa830da1fbe990de7792a0028ed181d00795
Author: Nan Lin <linnan@chromium.org>
Date:   Wed Nov 8 21:24:28 2023 +0000

    Delay sending cookie deprecation label until onboarding

    Delay sending the label until onboarding when third-party cookies are
    actually disabled.

    Bug: 1500681
@cdesouza-chromium @mkarolin
Fix MockPrivacySandboxDelegate missing abstract
750d1de 
A new abstract function has been added to the base class of this mock,
and this change adds the mocking for that.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/6c741e69558bbe9a3adfa1a6e19c029e22078acb

commit 6c741e69558bbe9a3adfa1a6e19c029e22078acb
Author: Nan Lin <linnan@chromium.org>
Date:   Fri Nov 10 22:03:15 2023 +0000

    Allow attribution reporting debug reports in cookie deprecation experiment

    Bypass the ar_debug cookie check when the cookie access is disallowed
    due to third-party cookies blocked by the cookie deprecation experiment.
    If the user explicitly blocks third-party cookies, it can't be bypassed.

    Bug: 1501067
@mkarolin
Disables upstream features flagged by security/privacy teams.
ad8ce55
@mkarolin
Disables Tracking Protection Oboarding.
2960a79 
Per security/privacy team.

Tried nullptr'ing TrackingProtectionOnboardingFactory first, but there's
code on Android that doesn't check for nullptr. Instead we override
TrackingProtectionOnboarding::MaybeMarkEligible, so it's never set it
eligible.
@mkarolin
Revert "WIP: Fixes crash in Brave browser tests."
c5717e9 
This reverts commit 37f77699e87b23df8e9d46d38a31d298078ca666.
@cdesouza-chromium @mkarolin
Extending ContentSettingsType with an override
5805e24 
This enum was being extended with a patch, however this a
non-controversial case in favour of using an override.
@cdesouza-chromium @mkarolin
Revert "Fixing ChromeBrowsingDataRemoverDelegate new occurrence"
9773959 
This reverts commit 4e94fe6.
@cdesouza-chromium @mkarolin
Revert "Extending ContentSettingsType with an override"
27654d9 
This enum cannot be extended with an override, as it is annotated with
`// GENERATED_JAVA_ENUM_PACKAGE`. The extended keys will not be
available in the java side without the keys being textually present.

This reverts commit 19438f0.
@cdesouza-chromium @mkarolin
Revert "Fix breakpad patch for IsValidCrashReportId"
2825a28 
This reverts commit 239fde1.
@cdesouza-chromium @mkarolin
[patching] Delete unused linux patch
5253671 
Patching of crashpad haas had no effect for a long period already, as
the specific file being patched is not being built on linux anymore, for
little over a year.

This change is deleting the patch altogher.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/b999986ff24699b81ecd3f45254a4bdf0332698a

commit b999986ff24699b81ecd3f45254a4bdf0332698a
Author: Peter Kasting <pkasting@chromium.org>
Date:   Wed Oct 25 03:54:27 2023 +0000

    Shorten code by using existing helper APIs, eliminating temps.

    No functional change.

    Bug: none

https://chromium.googlesource.com/chromium/src/+/7c44905e4a83c8c4811867c5bb27d10d8a086b34

commit 7c44905e4a83c8c4811867c5bb27d10d8a086b34
Author: Joshua Peraza <jperaza@chromium.org>
Date:   Wed Oct 5 22:15:41 2022 +0000

    linux: Remove breakpad integration

    Builds targeting Chrome OS remain runtime switchable between breakpad
    and crashpad, while Cast OS has only breakpad client integration.

    Bug: 1176772
@cdesouza-chromium @mkarolin
[skus] Formmating changes
447231c 
This file has been triggering the formatter in M120, possibly due to
updates to the toolchain.
@mkarolin
Fixes upstream shared storage browser tests.
a118755
@samartnik @mkarolin
[Android] Fix for unregistered kEnableSnippetsByDse preference
6824eba 
kEnableSnippetsByDse preference is only registered when Feed is enabled, however in Chromium they try to set it even when Feed is disabled.
Since we don't use Feed in Brave we need to disable this code.

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/1f4c1c5e28a37e3104c015eb30593d92cb3c516e

[DSE] Identify EEA countries

In this CL, we expose an API to identify EEA country to Java in
TemplateUrlService. Add a parameter and update chrome://flags.

Bug: 1475011
@mkarolin
[Android] monochrome_public_apk was renamed.
96e5747 
Renamed to monochrome_32_64_public_apk for 64-bit platforms.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/450c8413b6e16857ebe35eed1f06cdfdd9106596

commit 450c8413b6e16857ebe35eed1f06cdfdd9106596
Author: Sam Maier <smaier@chromium.org>
Date:   Thu Oct 5 18:32:32 2023 +0000

    Relandx2 "Renaming monochrome_public_bundle to m_32_64_p_b for 64-bit builds"

    This is a reland of commit c58c4142cb5f18148d4e42f98270204bbe5c19f0

    Fixed: hardcoded names of more expectations files, and copying
    the wrapper scripts.

    Original change's description:
    > Renaming monochrome_public_bundle to m_32_64_p_b for 64-bit builds
    >
    > The goal is to switch the name "monochrome_public_bundle" to build a
    > 64-bit primary Chrome. This is the first step, where we make
    > "monochrome_public_bundle" an alias to what it used to be. The next
    > step will be to change what the alias points to.
    >
    > This is also true for all other monochrome and trichrome targets that
    > default to a 32_64 configuration.
    >
    > Bug: 1479998
    > Change-Id: I0cfa0a84f79dc9013af72c7d653be4187c65ccda
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4858642
    > Reviewed-by: Richard (Torne) Coles <torne@chromium.org>
    > Commit-Queue: Sam Maier <smaier@chromium.org>
    > Cr-Commit-Position: refs/heads/main@{#1202715}

    Bug: 1479998
@mkarolin
Disable additional crashing/failing upstream browser tests.
b84bab2
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@mkarolin mkarolin merged commit efe022a into master Nov 27, 2023
7 checks passed
@mkarolin mkarolin deleted the cr120 branch November 27, 2023 21:51
@github-actions github-actions bot added this to the 1.62.x - Nightly milestone Nov 27, 2023
@github-actions github-actions bot removed the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label Nov 27, 2023
@mkarolin mkarolin mentioned this pull request Nov 28, 2023
Merged
25 tasks
mkarolin added a commit that referenced this pull request Nov 28, 2023
@mkarolin
Merge pull request #20434 from brave/cr120
bb915a1 
Upgrade from Chromium 119 to Chromium 120.
mkarolin added a commit that referenced this pull request Nov 30, 2023
@mkarolin
Merge pull request #20434 from brave/cr120
9ab1077 
Upgrade from Chromium 119 to Chromium 120.
@AlexeyBarabash AlexeyBarabash mentioned this pull request Dec 1, 2023
Open
@mkarolin
Copy link
Collaborator Author

mkarolin commented Dec 1, 2023 •
edited
Loading

When uplifting, also uplift:

kjozwiak pushed a commit that referenced this pull request Dec 1, 2023
@mkarolin @cdesouza-chromium
@emerick @samartnik @AlexeyBarabash
Upgrade from Chromium 119 to Chromium 120 (uplift to 1.61.x). (#21135)
587ce3e 
* Merge pull request #20434 from brave/cr120

Upgrade from Chromium 119 to Chromium 120.

* Updated chrome-VERSION.patch from Chromium 119.0.6045.163 to Chromium 120.0.6099.35.

* Additional assert_ts.js -> assert.js for 1.61.x.

Chromium change:

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

commit f7a2ea671005530e7a891bba411a34bfd1b3b4cd
Author: dpapad <dpapad@chromium.org>
Date:   Mon Oct 16 21:13:04 2023 +0000

    WebUI: Rename assert_ts.ts to assert.ts, part 7 (last)

    In this part updating one remaining reference in ui/file_manager/ and
    removing assert_ts.ts.

    assert_ts.ts used the "_ts" suffix to differentiate from the previously
    existing assert.js file. The latter no longer exists and the "_ts"
    suffix can be dropped.

    Fixed: 1291526

* Remove `SidePanelCoordinator` `final` keyword substitution (#20765)

`SidePanelCoordinator` is tagged upstream as `final`, and as a
workaround to be able to derive from it, an override had been introduced
at some point to replace the keyword `final` with naught. This type of
redefinition is unreliable, as it is UB, and it also becomes highly
viral.

This change replaces the substitution with a patch. The substitution was
removing the `final` keyword from the signature of other functions in
different headers, and leaving it with no token to indicate the function
is an override, causing a build failure.

* `Label::CalculatePreferredSize()` marked as `final` (#20767)

This function is now marked as `final`, however there is another entry
in the overload set that can be used in its place for the override in
`BraveVPNStatusLabel`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889

* Revert "Disable kPowerBookmarksSidePanel feature flag"

This reverts commit 237341e.

* Java files formatting.

* Fix `BraveBrowsingDataRemoverDelegate` substitution (#21034)

This override has been missing a matching header since it was
introduced, and this has been causing linking to fail in every upstream
occurrence of `ChromeBrowsingDataRemoverDelegateFactory::GetForProfile`
as the return type in the header was not being replaced accordingly.

This changes adds the changes to the header as well, and provides an
inclusion `BraveBrowsingDataRemoverDelegate` in the shadow file, to
allow the compiler to understand that
`BraveBrowsingDataRemoverDelegate*` is pefectly convertible to
`ChromeBrowsingDataRemoverDelegate`.

* [Android] Move JNI classes to jni_zero namespace

* Disabled failing upstream browser tests.

* Merge pull request #21152 from brave/maxk-fix-page-info-cookies-separator

[cr120 follow-up] Removes an extra separator in cookies page info view.

* Merge pull request #21153 from brave/maxk-redirect-on-device-data-to-cookies

[cr120 follow-up] Redirect On-device data link to cookies page.

* Merge pull request #21166 from brave/maxk-hide-hover-card-image-toggle

[cr120 follow-up] Hide Settings->Appearance hover card toggle.

* Fixed crash accessing 'send to devices' in share menu via Sync (#21168)

Fixes brave/brave-browser#34636

Related Chromium commit:
https://source.chromium.org/chromium/chromium/src/+/84ed1f62ecd64bbfc3d2c4775a6e80a6b0e9defb

Clean up SendTabToSelfSigninPromo flag

Enabled by default in M119 (https://crrev.com/c/4905024), can be
cleaned up in M120.

Fixed: 1479693, 1295204
Change-Id: Ic778e9c886a5d9391fb5da7510d166952481fe21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4905343
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Commit-Queue: Victor Vianna <victorvianna@google.com>
Cr-Commit-Position: refs/heads/main@{#1204655}

* Merge pull request #21169 from brave/120.0.6099.56_master

Upgrade from Chromium 120.0.6099.35 to Chromium 120.0.6099.56.

* Updated chrome-VERSION.patch from Chromium 120.0.6099.35 to Chromium 120.0.6099.56.

---------

Co-authored-by: cdesouza-chromium <cdesouza@brave.com>
Co-authored-by: Emerick Rogul <erogul@brave.com>
Co-authored-by: Artem Samoilenko <artem@brave.com>
Co-authored-by: AlexeyBarabash <AlexeyBarabash@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

@aseren aseren aseren left review comments

@cdesouza-chromium cdesouza-chromium cdesouza-chromium left review comments

@DJAndries DJAndries DJAndries approved these changes

@simonhong simonhong simonhong approved these changes

@yrliou yrliou yrliou approved these changes

@bsclifton bsclifton bsclifton approved these changes

@emerick emerick emerick approved these changes

@bridiver bridiver bridiver approved these changes

@goodov goodov goodov approved these changes

@iefremov iefremov iefremov approved these changes

@fallaciousreasoning fallaciousreasoning fallaciousreasoning approved these changes

@SergeyZhukovsky SergeyZhukovsky SergeyZhukovsky approved these changes

@tmancey tmancey tmancey approved these changes

@kylehickinson kylehickinson kylehickinson approved these changes

@Douglashdaniel Douglashdaniel Douglashdaniel approved these changes

@rillian rillian rillian approved these changes

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

Assignees

@samartnik samartnik

@cdesouza-chromium cdesouza-chromium

@mkarolin mkarolin

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) CI/run-windows-x86 Run CI builds for Windows x86 CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet unused-CI/run-macos-arm64 Run CI builds for macOS arm64
Projects
None yet
Milestone
1.62.x - Release
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 119 to Chromium 120.