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 131 to Chromium 132 1.74.x #26819

Merged
merged 18 commits into from
Dec 6, 2024
Merged

Upgrade from Chromium 131 to Chromium 132 1.74.x #26819

merged 18 commits into from
Dec 6, 2024

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Dec 2, 2024 •
edited by kjozwiak
Loading

Resolves brave/brave-browser#41761
Resolves brave/brave-browser#42532
Uplift from #26068

Resolves brave/brave-browser#42223
Uplift from #26493

Resolves brave/brave-browser#42241
Uplift from #26508

Resolves [No issue]
Uplift from #26508

Resolves brave/brave-browser#42200
Uplift from #26469

Resolves brave/brave-browser#42185
Uplift from #26461

Resolves brave/brave-browser#42490
Uplift from #26714

Resolves brave/brave-browser#42241
Uplift from #26508

Resolves brave/brave-browser#42222
Uplift from #26492

Resolves [No issue]
Uplift from #26412

Resolves brave/brave-browser#42123
Uplift from #26391

Resolves brave/brave-browser#42231
Uplift from #26499

Resolves brave/brave-browser#41629
Uplift from #26167

Resolves brave/brave-browser#42153
Uplift from #26433

Resolves brave/brave-browser#42196
Uplift from #26465

Resolves brave/brave-browser#42633
Uplift from #26829

Resolves brave/brave-browser#42674
Resolves brave/brave-browser#42703
Uplift from #26857

(These are all related)
Resolves brave/brave-browser#42663
Resolves brave/brave-browser#42664
Resolves brave/brave-browser#42665
Resolves brave/brave-browser#42666
Resolves brave/brave-browser#42667
Resolves brave/brave-browser#42668
Uplift from #26864

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:

@emerick emerick added this to the 1.74.x - Beta milestone Dec 2, 2024
@emerick emerick self-assigned this Dec 2, 2024
@emerick emerick requested a review from a team as a code owner December 2, 2024 21:12
@github-actions github-actions bot added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) feature/web3/wallet feature/web3/wallet/core labels Dec 2, 2024
@emerick emerick force-pushed the cr132-1.74.x branch 2 times, most recently from cde5e00 to d2a85da Compare December 2, 2024 22:03
@brave-builds
Copy link
Collaborator

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

@emerick emerick force-pushed the cr132-1.74.x branch 3 times, most recently from 91ebe51 to 842224c Compare December 4, 2024 03:15
emerick and others added 15 commits December 5, 2024 10:51
@emerick
Merge pull request #26068 from brave/cr132
d6bbcfb 
Upgrade from Chromium 131 to Chromium 132
@fallaciousreasoning @emerick
[Lit]: Migrate brave-item-list-more-items to Lit (#26493)
d8b841c
@cdesouza-chromium @emerick
[CodeHealth] Remove all uses of NOTREACHED_NORETURN (#26508)
7c52fc0 
This PR replaces all occurences of `NOTREACHED_NORETURN` with
`NOTREACHED`, since they are semantically identical.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/5a9d4c5aa85977fc711eb9c0ff1207c5ac1a0959

commit 5a9d4c5aa85977fc711eb9c0ff1207c5ac1a0959
Author: Peter Boström <[email protected]>
Date:   Tue Nov 12 01:38:46 2024 +0000

    Remove enable_log_error_not_reached

    This flag only applied to NOTREACHED_IN_MIGRATION() for ChromeOS which
    is on its way out.

    Bug: 40580068
@cdesouza-chromium @emerick
[CodeHealth] Drop proc-macro-error from filecoin-cxx (#26427)
af0b450 
* [CodeHealth] Drop `proc-macro-error` from `filecoin-cxx`

This PR updates all crates around `multihash` to use the latest
`multihash` version that does not depend anymore on `proc-macro-error`.
This crate is being removed as it is getting flagged in security audits
for being unmaintained, and it also relies on unstable rustc features.

* [rust] `gnrt` crate changes for `multihash` v.0.19

This commit includes all the mechanical changes done by `gnrt`.
@supermassive @emerick
Fix UNSAFE_TODO for wallet [part 2 of N] (#26469)
47bc54d
@cdesouza-chromium @emerick
[CodeHealth] Fix dangling span references (#26461)
c0e0f8b 
This PR fixes cases where a local constant is being used to initialise a
`span` but then the span is being used by the time the local has already
been discarded. This is undefined behaviour although in both cases it
seems to be incidently working.

Resolve brave/brave-browser#42185
@cdesouza-chromium @emerick
[CodeHealth] Normalise const declaration pt.1 (#26714)
8cf373a 
This PR is part of a couple of rewrites to be carried out normalising
the cases where we have constant declaration. In this PR we have the
following fixes:

 - Remove redundant `const` qualifier alongside `constexpr`
 - Function-scope constants as `static constexpr`
 - Remove the use of `extern` declarations
 - Whenever possible use `constexpr`
 - When appropriate, use `MakeFixedFlatSet`.

These changes are in conformance with some upcoming clarified guidelines.
Furthermore, this takes us one step closer to have some automation for
clang-tidy, as right now there are too many clang-tidy warnings around
constant/variable naming.

Resolves brave/brave-browser#42490
@cdesouza-chromium @emerick
[CodeHealth] Remove all uses of NOTREACHED_NORETURN (#26508)
d86e951 
This PR replaces all occurences of `NOTREACHED_NORETURN` with
`NOTREACHED`, since they are semantically identical.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/5a9d4c5aa85977fc711eb9c0ff1207c5ac1a0959

commit 5a9d4c5aa85977fc711eb9c0ff1207c5ac1a0959
Author: Peter Boström <[email protected]>
Date:   Tue Nov 12 01:38:46 2024 +0000

    Remove enable_log_error_not_reached

    This flag only applied to NOTREACHED_IN_MIGRATION() for ChromeOS which
    is on its way out.

    Bug: 40580068
@fallaciousreasoning @emerick
[Lit]: Update ExtensionsToolbarElement override (#26492)
6885971
@fallaciousreasoning @emerick
[NOTREACHED]: Migrate a bunch of NOTREACHED_IN_MIGRATIONS (#26412)
a8583ff 
* [NOTREACHED]: Update OpenBraveVPNUrls

* [NOTREACHED]: Update ParseFeedItems

* [NOTREACHED]: Migrate GenerateAllFeed

* [NOTREACHED]: Migrate MdTextButton

* [NOTREACHED]: Migrate NTPBackgroundPrefs

* [NOTREACHED]: Migrate brave_app_menu_model

* [NOTREACHED]: Migrate b/u/tabs

* [NOTREACHED]: b/u/v/frame

* [NOTREACHED]: b/b/themes
@AlexeyBarabash @emerick
Replaced NOTREACHED_IN_MIGRATION for Brave Sync code (#26391)
d62c04d 
* Replaced NOTREACHED_IN_MIGRATION for Brave Sync code
@cdesouza-chromium @emerick
[DanglingPtr] Remove ProfileMenuViewBase patching (#26499)
62f9c4b 
This patch was introduced as a temporary measure to allow switching on
the dangling pointer detector.

This PR fixes the two dangling pointers in `ProfileMenuViewBase` by
avoiding calling `SetProfileIdentityInfo` more than once, and actually
overriding it, so the first call to the `SetProfileIdentityInfo` can be
given the correct arguments.

One test had to be disabled, as it was not actually testing the way the
profile menu viewer was being instantiated. The way brave does it
requires to consult theme data, which is not available for this
particular test.

Resolves brave/brave-browser#42231
@emerick @darkdh
Disable screen_ai component download/installation (#26167)
e5c1d5b 
* Disable screen_ai component download/installation

* Disable upstream OCR integration

---------

Co-authored-by: Anthony Tseng <[email protected]>
@AlexeyBarabash @emerick
Fix unused variables warnings at java (#26433)
ac50971 
* Removed unused variables and members at Brave java files
@cdesouza-chromium @emerick
[DanglingPtr] Fix WebUIBubbleManagerImpl dangling patch (#26465)
9b1640f 
A patch was added to `WebUIBubbleManagerImpl` when enabling the dangling
pointer detector on Linux, as a temporary measure. This change corrects
the the underlying issue requiring this pointer to be marked as
dangling.

This particular dangling pointer occurred because the toolbar view was
being passed as the achor for this browser data bubbles, the toolbar
gets destroyed prior to these browser data bubbles being disposed. This
PR adds checks during in the `BraveBrowserView` dtor, to make sure there
are no dangling references to the toolbar view by the time the
termination is cleaning up browser data.

Resolves brave/brave-browser#42196
emerick and others added 2 commits December 5, 2024 10:53
@emerick
Merge pull request #26829 from brave/cr132-followup-add-aida-client-u…
aaceea4 
…nittest

Add unit test to ensure that AidaClient remains disabled
@brave-builds @emerick
Upgrade from Chromium 132.0.6834.15 to Chromium 132.0.6834.33
4b3bb5d 
Update pins list timestamp

Updated strings for Chromium 132.0.6834.33
@emerick
Merge pull request #26864 from brave/cr132-followup-fix-broken-tab-gr…
9aefa81 
…oup-menu-options

Fix broken tab group menu options
kjozwiak
kjozwiak approved these changes Dec 6, 2024
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.74.x approved 👍

@kjozwiak kjozwiak merged commit c2872a2 into 1.74.x Dec 6, 2024
16 checks passed
@kjozwiak kjozwiak deleted the cr132-1.74.x branch December 6, 2024 04:02
@brave-builds
Copy link
Collaborator

Released in v1.74.21

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

Assignees

@emerick emerick

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/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Milestone
1.74.x - Beta
Development

Successfully merging this pull request may close these issues.
7 participants
@emerick @brave-builds @kjozwiak @fallaciousreasoning @cdesouza-chromium @supermassive @AlexeyBarabash