Skip to content

Upgrade from Chromium 135 to Chromium 136 (1.78.x) #28705

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
Merged
merged 8 commits into from
Apr 22, 2025
Merged

Upgrade from Chromium 135 to Chromium 136 (1.78.x) #28705

merged 8 commits into from
Apr 22, 2025

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Apr 16, 2025 •
edited by mkarolin
Loading

Resolves brave/brave-browser#44567
Uplift from #27986

Resolves brave/brave-browser#45354
Uplift from #28609

Resolves brave/brave-browser#45506
Uplift from #28710

Resolves brave/brave-browser#45545
Uplift from #28731

Resolves brave/brave-browser#45548
Uplift from #28728

Resolves brave/brave-browser#45533
Uplift from #28725

Resolves brave/brave-browser#45564
Uplift from #28748

Resolves brave/brave-browser#45589
Uplift from #28751

@emerick emerick added this to the 1.78.x - Beta milestone Apr 16, 2025
@emerick emerick self-assigned this Apr 16, 2025
@emerick emerick requested a review from a team as a code owner April 16, 2025 19:47
@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 Apr 16, 2025
@brave-builds
Copy link
Collaborator

Note

You have got a presubmit notification. No action required.

DanglingUntriaged pointers removed: 2
Thank you!

@brave-builds
Copy link
Collaborator

Warning

You have got a presubmit warning. Please address it if possible.

You might be calling functions intended only for testing from
production code.  If you are doing this from inside another method
named as *ForTesting(), then consider exposing things to have tests
make that same call directly.
If that is not possible, you may put a comment on the same line with
  // IN-TEST 
to tell the PRESUBMIT script that the code is inside a *ForTesting()
method and can be ignored. Do not do this inside production code.
The android-binary-size trybot will block if the method exists in the
release apk.
Note: this warning might be a false positive (crbug.com/1196548).

Items:

android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java:118
    public void turnOnSyncForTesting(

@brave-builds
Copy link
Collaborator

Warning

You have got a presubmit warning. Please address it if possible.

Banned functions were used.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:33:
      Code gated by GOOGLE_CHROME_BRANDING is effectively untested. This is typically wrong. Valid use cases are glue for private modules shipped alongside Chrome, and installation-related logic.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:33:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:39:
      Code gated by GOOGLE_CHROME_BRANDING is effectively untested. This is typically wrong. Valid use cases are glue for private modules shipped alongside Chrome, and installation-related logic.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:39:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:176:
      Code gated by GOOGLE_CHROME_BRANDING is effectively untested. This is typically wrong. Valid use cases are glue for private modules shipped alongside Chrome, and installation-related logic.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:176:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:179:
      Code gated by GOOGLE_CHROME_BRANDING is effectively untested. This is typically wrong. Valid use cases are glue for private modules shipped alongside Chrome, and installation-related logic.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:179:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:243:
      Code gated by GOOGLE_CHROME_BRANDING is effectively untested. This is typically wrong. Valid use cases are glue for private modules shipped alongside Chrome, and installation-related logic.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:243:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:245:
      Code gated by GOOGLE_CHROME_BRANDING is effectively untested. This is typically wrong. Valid use cases are glue for private modules shipped alongside Chrome, and installation-related logic.
    chromium_src/chrome/browser/first_run/upgrade_util_win.cc:245:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/browser/ui/webui/current_channel_logo.cc:15:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    chromium_src/chrome/install_static/chromium_install_modes.h:33:
      Code gated by OFFICIAL_BUILD is effectively untested. This is typically wrong. One valid use case is low-level code that handles subtleties related to high-levels of optimizations that come with OFFICIAL_BUILD.
    components/p3a/nitro_utils/attestation.cc:132:
      Do not use UNSAFE_TODO() to write new unsafe code. Use only when removing a pre-existing file-wide allow_unsafe_buffers pragma, or when incrementally converting code off of unsafe interfaces
    components/p3a/nitro_utils/attestation.cc:150:
      Do not use UNSAFE_TODO() to write new unsafe code. Use only when removing a pre-existing file-wide allow_unsafe_buffers pragma, or when incrementally converting code off of unsafe interfaces

@brave-builds
Copy link
Collaborator

Warning

You have got a presubmit warning. Please address it if possible.

  browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java:144: Use SharedPreferencesManager instead to access app-wide SharedPreferences from //src/chrome.
  browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubManagerImpl.java:156: Use SharedPreferencesManager instead to access app-wide SharedPreferences from //src/chrome.
  browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubToolbarView.java:68: Use SharedPreferencesManager instead to access app-wide SharedPreferences from //src/chrome.
  browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/BraveHubToolbarView.java:70: Use SharedPreferencesManager instead to access app-wide SharedPreferences from //src/chrome.

@brave-builds
Copy link
Collaborator

Warning

You have got a presubmit warning. Please address it if possible.

Found 2 lines longer than 80 characters (first 5 shown).

Items:

chromium_src/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.ts, line 123, 97 chars
chromium_src/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.ts, line 138, 100 chars

@brave-builds
Copy link
Collaborator

Warning

You have got a presubmit warning. Please address it if possible.

Patch should not add or remove empty lines at hunk boundaries

Items:

patches/chrome-utility-BUILD.gn.patch:10 (+empty line)
patches/extensions-browser-user_script_manager.h.patch:9 (-empty line)
patches/third_party/search_engines_data/resources/definitions-prepopulated_engines.json.patch:25 (-empty line)
patches/third_party/search_engines_data/resources/definitions-prepopulated_engines.json.patch:55 (-empty line)

@brave-builds
Copy link
Collaborator

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

@emerick emerick force-pushed the cr136-1.78.x branch 4 times, most recently from eac7030 to aab2980 Compare April 18, 2025 13:17
mihaiplesa and others added 6 commits April 18, 2025 11:08
@mihaiplesa @emerick
Merge pull request #27986 from brave/cr136
175121c 
Upgrade from Chromium 135 to Chromium 136
@cdesouza-chromium @emerick
[bugfix] Add chromium_src check heuristics to detect partial matches (
0ed1d5d 
#28609)

It was recently uncovered that an override `ShouldShowPromo` silently
slipped away, as the presubmit check was partially matching for
`ShouldShowPromoBasedOnImpressionOrDismissalCount`. This has been hiding
a live bug that users have reported where they were being shown the sign
in promo.

This change does a few things. First, there's an improvement to how the
presubmit works, by making sure overrides do occur in the target files
by matching them as a token.

Additionally, to determine if it is an error or a warning the absecence
of a token in the target file, the presubmit relies on a check for the
token occcurring in the override file, and when it does, it concludes
just warns, as there is a chance the macro is being used in the
override. This check is being tweaked a bit in this change, to be
constrained only to `SHOUTY_CASE` tokens, as common word tokens are
most certainly not common macros and should occur in the target file, so
their presence in the override file is immaterial to the rules.

Lastly, this change corrects a few places where overrides had slipped
away, and it changes a few overrides to their respective files, rather
than relying on replacement of transient inclusions.

In particular, the `ShouldShowPromo` override is being fixed, and these
functions are being blocked again.

Resolves brave/brave-browser#45354

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/5692313c36387f63418877d922669cc3134a18cc
https://chromium.googlesource.com/chromium/src/+/d59dbad55ace20c22aefe84aed328f83065827ad

commit 5692313c36387f63418877d922669cc3134a18cc
Author: Amelie Schneider <amelies@google.com>
Date:   Mon May 13 09:22:14 2024 +0000

    [UNO] Don't show Sign-in promo after 5 impressions/2 dismissals

    Only show the autofill sign in promo bubble 5 times per account per
    profile with 1 week delay between impressions. Do not show it again if
    it was dismissed twice.
    Also moves SyncPromoUI::ShouldShowSyncPromo to
    chrome/browser/signin/signin_promo_util.h for consistency.

    Bug: b:319411476

    Change-Id: I8de968cb5d08dcc0561f46471eab5b68af47ec02
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5446906
    Commit-Queue: Amelie Schneider <amelies@google.com>
    Reviewed-by: Alex Ilin <alexilin@chromium.org>
    Reviewed-by: Ryan Sultanem <rsult@google.com>
    Cr-Commit-Position: refs/heads/main@{#1299945}

commit d59dbad55ace20c22aefe84aed328f83065827ad
Author: Caroline Rising <corising@chromium.org>
Date:   Mon Apr 8 17:23:43 2024 +0000

    Clean up chrome refresh 2023 from RecentTabsSubMenuModelTests

    Change-Id: I766820c477e06f5c156cb2b4e85f3efdbb1f9ce9
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5435914
    Commit-Queue: Caroline Rising <corising@chromium.org>
    Reviewed-by: Darryl James <dljames@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1283927}
@kjozwiak @emerick
Merge pull request #28710 from brave/cr136.x
39e283f 
Upgrade from Chromium 136.0.7103.25 to Chromium 136.0.7103.35
@emerick
Merge pull request #28731 from brave/emerick-cr136-followup-disable-o…
3ba5b5e 
…utline-silhouette-icon

Disable kOutlineSilhouetteIcon feature flag
@AlexeyBarabash @samartnik @emerick
[Android] Wait for native initialization when creating bottom strip (#…
dc322c4 
…28728)

* [cr137] [Android] Wait for native initialization when creating bottom strip

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

[Tab Group UI] Wait for native initialization when creating bottom strip

Wait for native initialization to complete before initializing the
bottom tab strip. Otherwise it will try to initialize pre-native and
crash. This appears to have regressed in M134/M135 likely due to some
lifecycle change for the BottomControlsCoordinator.

Fixed: 407305088

* Suppressed warning around ContextUtils.getAppSharedPreferences()

---------

Co-authored-by: Artem Samoilenko <artem@brave.com>
@emerick
Merge pull request #28725 from brave/emerick-hide-image-labels-access…
d348882 
…ibility-toggle

Hide the image labels toggle button in brave://settings/accessibility
@atuchin-m
Copy link
Collaborator

Please also include the following follow up to v1.78.x and v1.77.x: #28748

@cdesouza-chromium
Copy link
Collaborator

We seem to be missing this PR as well for uplifting #28710

@mkarolin
[cr136 follow up] Fixes avatar menu guest icon. (#28751)
51bb44d 
Chormium change:

https://source.chromium.org/chromium/chromium/src/+/83106df76363b6a0f301dd60745e711751cf88cd

commit 83106df76363b6a0f301dd60745e711751cf88cd
Author: David Roger <droger@chromium.org>
Date:   Thu Mar 13 14:09:39 2025 -0700

    Reland "[Uno-D] Enable Phase 0 fast-follow flags by default"

    This is a reland of commit cefe36665901c8a494126cbf669708aaefd3d955

    Original change's description:
    > [Uno-D] Enable Phase 0 fast-follow flags by default
    >
    > Enables by default:
    > * kOutlineSilhouetteIcon
    > * kImprovedSigninUIOnDesktop
    > * kImprovedSettingsUIOnDesktop
    > * kAutofillRemovePaymentsButterDropdown
    >
    > Bug: 356606258
@brave-builds
Copy link
Collaborator

Note

You have got a presubmit notification. No action required.

-------------------------
[Info] chromium_src:
Located 103 #define statements.

kjozwiak
kjozwiak approved these changes Apr 22, 2025
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.78.x approved 👍

@kjozwiak kjozwiak merged commit a7b82f7 into 1.78.x Apr 22, 2025
16 checks passed
@kjozwiak kjozwiak deleted the cr136-1.78.x branch April 22, 2025 21:59
@brave-builds
Copy link
Collaborator

Released in v1.78.88

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.78.x - Release
Development

Successfully merging this pull request may close these issues.
8 participants
@emerick @brave-builds @atuchin-m @cdesouza-chromium @kjozwiak @mihaiplesa @AlexeyBarabash @mkarolin