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 124 to Chromium 125. #22936

Merged
merged 132 commits into from
May 3, 2024
Merged

Upgrade from Chromium 124 to Chromium 125. #22936

merged 132 commits into from
May 3, 2024

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Apr 4, 2024

Resolves brave/brave-browser#37333

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 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) CI/run-windows-arm64 Run CI builds for Windows arm64 labels Apr 4, 2024
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels Apr 4, 2024
@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

@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

@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

mkarolin and others added 19 commits May 3, 2024 16:54
Chromium change:
commit 85bfdb404c23fa2a3ecc83cb335619fee1be619a
Author: Joshua Hood <jdh@chromium.org>
Date:   Mon Apr 15 17:17:41 2024 +0000

    Add TOP_LEVEL_TPCD_ORIGIN_TRIAL as a content settings type

    Subsequent CLs will make use of this new content settings type.

    Bug: 332707126
    Change-Id: I33cc33ee6ab0a284bfc73e53b51656103dfca3ce
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5440378
    Reviewed-by: Christian Dullweber <dullweber@chromium.org>
    Reviewed-by: Joe Mason <joenotcharles@google.com>
    Reviewed-by: Martin Šrámek <msramek@chromium.org>
    Commit-Queue: Joshua Hood <jdh@chromium.org>
    Auto-Submit: Joshua Hood <jdh@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1287431}
Upstream change:
https://chromium.googlesource.com/chromium/src/+/cdb4efcd0b060341a2864a63d6104d91082e8064

commit cdb4efcd0b060341a2864a63d6104d91082e8064
Author: Patricia Alfonso <trishalfonso@google.com>
Date:   Thu Apr 11 22:38:05 2024 +0000

    [optimize-content-settings] Enable indexed content settings by default

    Bug: 316530672
    Change-Id: I33b4852e9d2ba1bcade6b1e6c809a6c6a9d67236
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5435975
    Reviewed-by: Christian Dullweber <dullweber@chromium.org>
    Reviewed-by: Filipa Senra <fsenra@google.com>
    Commit-Queue: Patricia Alfonso <trishalfonso@google.com>
    Cr-Commit-Position: refs/heads/main@{#1286152}
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/94794635ed8558f2892ff4055c93239492448e68

[TabTearing] Restrict closing empty window after tab reparenting to
desktop windowing mode

Currently, when the only tab in a Chrome window is dragged out and into
another Chrome window in multiwindow mode, the empty source window is
closed. Restrict closing the empty window to desktop windowing mode,
such a window should continue to exist in split screen after tab
reparenting.

Bug: 333411285
We have digital goods API disabled in
BraveContentRendererClient::SetRuntimeFeaturesDefaultsBeforeBlinkInitialization.
With /0 variation the test works as expected and the API is not
available.

However with /1 variation the test runs with the
--enable-blink-test-features switch and the API should become available,
but it doesn't.

Running brave Nightly with cr124 and the switch enables the API as can
be tested by opening devtools and running window.getDigitalGoodsService().
The same doesn't work with cr125.

Created a followup issue to investigate.
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/1ef841d136c21d003632548a8b782a3584fee95a

commit 1ef841d136c21d003632548a8b782a3584fee95a
Author: dpapad <dpapad@chromium.org>
Date:   Mon Mar 25 18:40:14 2024 +0000

    WebUI: Replace paper-ripple with cr-ripple in various UIs.

    This is in preparation of removing paper-ripple from Desktop builds.

    Bug: 330377196
See the earlier related commit "MojoBubbleWebUIController renamed".

Chromium change:

https://chromium.googlesource.com/chromium/src/+/022dbd8fdbb806eea374cd1ba620183f0130e9b0

commit 022dbd8fdbb806eea374cd1ba620183f0130e9b0
Author: Keren Zhu <kerenzhu@chromium.org>
Date:   Fri Mar 22 15:00:46 2024 +0000

    webui: rename MojoBubbleWebUIController to TopChromeWebUIController

    Rename MojoBubbleWebUIController -> TopChromeWebUIController and
    UntrustedBubbleWebUIController -> UntrustedTopChromeWebUIController
    because they are used outside of bubbles, e.g. in Side Panel.

    Also move them from ui/webui to cbui/webui/top_chrome since they are not
    used outside of cbui/.

    Bug: 329677669
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/902cb945068236deac7cbcff63d7b69335dd8eca

commit 902cb945068236deac7cbcff63d7b69335dd8eca
Author: Hubert Chao <hchao@chromium.org>
Date:   Tue Mar 26 18:32:50 2024 +0000

    New Cert Management UI: add infrastructure plumbing to support development

    * add a feature flag turning on and off the new UI
    * add a BUILD flag
    * add a skeleton new tag for the new webui page.

    Bug: 1477317
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/ffdbc5945b0faac9fd9f0b7e0e76feadee6fb9cc

commit ffdbc5945b0faac9fd9f0b7e0e76feadee6fb9cc
Author: dpapad <dpapad@chromium.org>
Date:   Fri Mar 29 23:25:37 2024 +0000

    Settings: Cleanup pre CR2023 codepaths.

    Bug: 326116364
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/f0d39089418dcd1ef071d8e8d44677d8250c884a

commit f0d39089418dcd1ef071d8e8d44677d8250c884a
Author: Fiona Macintosh <fmacintosh@google.com>
Date:   Wed Mar 20 19:39:46 2024 +0000

    [3PC Settings] Clean up pre-alignment UI

    Has been launched in stable for 2 milestones
Chromium change:

https://chromium.googlesource.com/chromium/src/+/434c7bb9b06dc

commit 434c7bb9b06dc932bd6522f7071eb13c9d3f01da
Author: Akhila Veerapuraju <dhveerap@microsoft.com>
Date:   Wed Mar 20 18:15:35 2024 +0000

    [PDF] Move generic utils from //chrome to //components/pdf (2/2)

    Moves pdf_frame_util.cc/h from //chrome to //components/pdf.

    This enables their use in both layers and eliminates the need for
    client implementations in //chrome to access them in //components.

    A future CL will remove these client implementations.

    Part 1: https://crrev.com/c/5232401

    Bug: 41493897
The cause of failure for these tests was fixed in
#20825.
This function is only declared as a mock stub, which is being updated
with this change.

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

commit eccd28f754b59a5010f8fc5e198acf694bbc382f
Author: Xinghui Lu <xinghuilu@chromium.org>
Date:   Wed Apr 17 15:37:47 2024 +0000

    [DownloadReport] Notify download delegate only if called at shutdown.

    In https://crrev.com/c/5449023, we notify download delegate that a
    download is canceled at shutdown. However, CancelDownloads can be
    called at shutdown or profile deletion. This CL adds a parameter in
    CancelDownloads to specify the trigger type. Download delegate will
    be notified only if the trigger type is kShutdown.

    Bug: 329471668
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/521eda4826c473e9f916163d471c59d40fdc8813

[M125][LogoPolish] Only enable Logo Polish for Google doodle on NTP.

This CL only enables the logo polish and adjust the logo size on NTP
when the logo is a Google doodle.
The behavior will look like this:
For Phone:
https://drive.google.com/file/d/1Sanx-LqGhzA9NjX9RZaKc4JGFyizQm8O/view?usp=sharing&resourcekey=0-G8NxGsD0ZMiwzPdkcb1jxA
For Tablet:
https://drive.google.com/file/d/1mQKFDLFHh8wEbrbvXAIXApiT-jC-Ykup/view?usp=sharing&resourcekey=0-Tk6_0wGgcjLRqTS1aUjVoQ

(cherry picked from commit 4dd30b9213c2d36bf2f4d4e4cf60ad57adf8901b)

Bug: 335276342
This regression comes from this upstream change.
https://chromium-review.googlesource.com/c/chromium/src/+/5393423

As it sets with color ID, SetTextColorId() should be used.
@brave-builds
Copy link
Collaborator

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

@mkarolin mkarolin merged commit 3d10670 into master May 3, 2024
19 checks passed
@mkarolin mkarolin deleted the cr125 branch May 3, 2024 23:21
@mkarolin mkarolin added this to the 1.67.x - Nightly milestone May 3, 2024
mkarolin added a commit that referenced this pull request May 5, 2024
Upgrade from Chromium 124 to Chromium 125.
mkarolin added a commit that referenced this pull request May 8, 2024
Upgrade from Chromium 124 to Chromium 125.
kjozwiak pushed a commit that referenced this pull request May 8, 2024
* Merge pull request #23049 from brave/ksmith-webui-bubble-mgr

Simplify customization of WebUIBubbleManager

* Merge pull request #22936 from brave/cr125

Upgrade from Chromium 124 to Chromium 125.

* NTP drive module was renamed to file suggestion.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/1af2f445d25a6

commit 1af2f445d25a6f2e12984418df7b9a0bd09d4523
Author: Riley Tatum <rtatum@google.com>
Date:   Mon Apr 8 18:55:34 2024 +0000

    [NTP] Rename drive module to file suggestion for cleaner reuse of code

    This change is helping to prepare for another source for file
    suggestions to be added to the NTP. The other file suggestion source
    will have the same UX; therefore, it would be best to reuse as much code
    as possible.

    Code that can be used across both sources for the module, are changed
    to use the term "file_suggestion" instead of "drive". Code that is
    specific to the Drive source keeps the name "drive". This shouldn't
    change any functionality. It is just meant to make the reuse of this
    code cleaner.

    I left v1 of the module largely alone, since extra source support will
    not be added for the older version of modules .

    Bug: 329897261

* Merge pull request #23429 from brave/sko/spt-resurrect

Fix SharedPinnedTab functionality

* TabStripModel::DetachWebContentsAtForInsertion was removed.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/afdf1e54a8ef45bfd22ecabfea0012da22bba6a3

commit afdf1e54a8ef45bfd22ecabfea0012da22bba6a3
Author: Erik Chen <erikchen@chromium.org>
Date:   Mon Apr 15 20:56:17 2024 +0000

    Remove TabStripModel::DetachWebContentsAtForInsertion.

    This CL is a refactor with no intended behavior change. This CL removes
    callers of DetachWebContentsAtForInsertion. This also allows
    TabModel::RemoveContents to become private.

    Bug: 1476012

* Disables crashing upstream unit tests.

* Merge pull request #23441 from brave/maxk-fix-bookmarks-folder-color

[cr125 follow up] Fixes bookmarks folder color in the side panel.

* Merge pull request #23497 from brave/bookmarks_panel_checkboux

Fixed bookmarks panel checkbox colors

* Restore .rustfmt.toml patch accidentally removed by cr124 bump.

---------

Co-authored-by: Kevin Smith <zenparsing@gmail.com>
Co-authored-by: Sangwoo Ko <sko@brave.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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-arm64 Run CI builds for Windows arm64 CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 124 to Chromium 125.