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 126 to Chromium 127 #23829

Merged
merged 131 commits into from
Jun 25, 2024
Merged

Upgrade from Chromium 126 to Chromium 127 #23829

merged 131 commits into from
Jun 25, 2024

Conversation

emerick
Copy link
Contributor

@emerick emerick commented May 24, 2024

Resolves brave/brave-browser#38560

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:

@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 May 24, 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

@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

emerick and others added 14 commits June 25, 2024 13:13
@emerick @cdesouza-chromium
Add missing //components/manta dep
471bb44
@emerick @cdesouza-chromium
Disable GoogleGroupsUpdaterService via factory on desktop
4fb93a3 
We disable this service on iOS, but let's also disable it on desktop.

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/6952ce1a5bab9ac1cf2c190883bd0e152ebc5f41

commit 6952ce1a5bab9ac1cf2c190883bd0e152ebc5f41
Author: Marc Treib <treib@chromium.org>
Date:   Tue May 14 21:50:04 2024 +0000

    Migrate GoogleGroupsUpdaterService to SyncServiceObserver

    Before this CL, GoogleGroupsUpdaterService exposed a public
    ClearSigninScopedState() and relied on users (in practice, the
    implementations of SyncClient::OnLocalSyncTransportDataCleared()) to
    call it at the right time.

    This CL migrates it to implement SyncServiceObserver instead, and
    internally clear the state at the right time (i.e. when the sync
    TransportState becomes DISABLED).

    The new behavior is not 100% identical to the old one, but it's very
    close and should work out to the same thing in practice.

    The new implementation is cleaner architecture-wise, and will (after
    some additional changes) allow us to get rid of
    SyncClient::OnLocalSyncTransportDataCleared().

    Bug: 40724759, 337034860
@simonhong @cdesouza-chromium
Updated vector_icons/leo_overrides.json
04dc216 
Replaced upstream's chrome refresh icon version that we've been using.
@emerick @cdesouza-chromium
Revert tri-color theme picker to bi-color picker and fix theme colors…
4877e2f 
… for tabs

Now that ChromeRefresh2023 is active, the ThemeColorPickerHandler is using a
tri-color picker and foreground/background tabs and the tab strip were not
taking on theme colors as expected.

This change creates overrides to:

  - Replace SetUserColorAndBrowserColorVariant with
    BuildAutogeneratedThemeFromColor to correct the theme coloring for tabs and
    the tab strip.

  - Replace kGeneratedColorsInfo with kCustomizeChromeColors, allowing us to
    return to using the bi-color theme picker in brave://settings and the
    profile dialog. We call getChromeColors with extended_list=true from
    TypeScript in order to take advantage of this code path in the theme
    handler.

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/05baea744f4111671b9e3b9baf28f8c1727f78c5

commit 05baea744f4111671b9e3b9baf28f8c1727f78c5
Author: Alison Gale <agale@chromium.org>
Date:   Wed May 15 17:38:31 2024 +0000

    Remove references to launched kChromeRefreshSecondary2023 feature

    Also cleaned up some test-only references to kChromeRefresh2023 when
    they were adjacent.

    #chrome-refresh-2023-cleanup

    Bug: 335904039
@emerick @cdesouza-chromium
Revert "Disable IsolateSandboxedIframes feature flag"
9dd0cfc 
This reverts commit f2a3b1b.
@emerick @cdesouza-chromium
Add allow-same-origin attribute to sandbox attribute for portfolio chart
15315fd 
Since the IsolateSandboxedIframes feature flag was enabled, the
chrome-untrusted://line-chart-display Wallet browser tests for the portfolio
chart have been failing. In order to temporarily work around those failures,
we've added allow-same-origin to the sandbox attribute for that chart.

Entered brave/brave-browser#38771 to address this in a
follow-up.

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/b2c49e9ef800bc606041fc9356e665d11869cb30

commit b2c49e9ef800bc606041fc9356e665d11869cb30
Author: W. James MacLean <wjmaclean@chromium.org>
Date:   Wed May 15 19:54:12 2024 +0000

    Enable IsolateSandboxedIframes by default.

    This CL enables the IsolateSandboxedIframes feature by default.

    Bug: 40082497
@emerick @cdesouza-chromium
Add RenderViewHostTestEnabler for SplitViewBrowserData unit tests
ed45376 
This avoids the following DCHECK:

  Check failed: instance->IsTestRenderFrameHost(). You may want to instantiate RenderViewHostTestEnabler.
@emerick @cdesouza-chromium
Disable syncer::kEnableBookmarkFoldersForAccountStorage
8645878 
Disabling this feature flag (which is enabled on iOS and Android by default) for
now as it requires a Google account and possibly other backend support.
@simonhong @cdesouza-chromium
Disabled some upstream color mixers that overwrite our colors
fa7c3e4 
After deleting 2023UIRefresh features, upstream's all new color
mixers are added and it overwrites our colors. Some of them are
called from our code and others are not needed.
@simonhong @cdesouza-chromium
Updated layout constants for toolbar
245342e 
After deleting 2023UIRefresh, upstream's toolbar margin is increased.
This causes our toolar has more long height. Back to previous value.
@simonhong @cdesouza-chromium
Fixed dialog button has long height
93dd1da 
After deleting 2023UIRefresh, more larger text button's vertical
padding is set. This made dialog button bigger.
Set to previous vertical padding.
@simonhong @cdesouza-chromium
Added missing views combobox control colors
ddb4cb9
@cdesouza-chromium
[rust] winapi crate dropped by upstream
1a86bea 
This crate has been dropped in upstrem but it is still required in
brave. This change checks it out in our tree.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/2a140ac6fc6943d7689fc41f8c4573e3d27cba7d

commit 2a140ac6fc6943d7689fc41f8c4573e3d27cba7d
Author: danakj <danakj@chromium.org>
Date:   Mon May 27 15:45:04 2024 +0000

    Roll winapi-util: 0.1.6 => 0.1.8 in //third_party/rust.

    This change moves the dependency for windows bindings from winapi to
    the windows-rs crates published by Microsoft. Those crates come with
    .lib files that must be made available for linking, so we add them
    to gnrt_config.toml under the `native_libs_roots` variable.

    Native libs are copied into the toolchain's `./rustlib` directory
    and that directory is added to the library search path in order to
    find them there. This ensures the correct architecture library is
    used for host toolchains.

    This CL has been created semi-automatically.  The expected review
    process and other details can be found at
    //tools/crates/create_update_cl.md

    Updated crates:

    * winapi-util: 0.1.6 => 0.1.8

    New crates:

    * windows-sys@0.52.0
    * windows-targets@0.52.5
    * windows_aarch64_gnullvm@0.52.5 (as placeholder)
    * windows_aarch64_msvc@0.52.5
    * windows_i686_gnu@0.52.5 (as placeholder)
    * windows_i686_gnullvm@0.52.5 (as placeholder)
    * windows_i686_msvc@0.52.5
    * windows_x86_64_gnu@0.52.5 (as placeholder)
    * windows_x86_64_gnullvm@0.52.5 (as placeholder)
    * windows_x86_64_msvc@0.52.5

    Removed crates:

    * winapi-i686-pc-windows-gnu@0.4.0
    * winapi-x86_64-pc-windows-gnu@0.4.0
    * winapi@0.3.9

    Chromium `supply-chain/config.toml` policy requires that the following
    audit criteria are met (note that these are the *minimum* required
    criteria and `supply-chain/audits.toml` can and should record a stricter
    certification if possible;  see also //docs/rust-unsafe.md):

    * winapi-util@0.1.8, windows-sys@0.52.0, windows-targets@0.52.5,
      windows_aarch64_gnullvm@0.52.5, windows_aarch64_msvc@0.52.5,
      windows_i686_gnu@0.52.5, windows_i686_gnullvm@0.52.5,
      windows_i686_msvc@0.52.5, windows_x86_64_gnu@0.52.5,
      windows_x86_64_gnullvm@0.52.5, windows_x86_64_msvc@0.52.5:
      does-not-implement-crypto, safe-to-run

    Fixed: 342194487
@cdesouza-chromium
[rust] Ignore format for chromium_crates_io/vendor
9a0080a 
Crates under this path were triggering format. This mirrors what is
being done in upstream.
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Jun 25, 2024
@brave-builds
Copy link
Collaborator

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

bridiver
bridiver approved these changes Jun 25, 2024
View reviewed changes
Copy link
Collaborator

@bridiver bridiver left a comment

Choose a reason for hiding this comment

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

follow-up for remaining rust config issues

@emerick emerick merged commit a9f6cdc into master Jun 25, 2024
19 checks passed
@emerick emerick deleted the cr127 branch June 25, 2024 15:42
@github-actions github-actions bot added this to the 1.69.x - Nightly milestone Jun 25, 2024
@emerick emerick mentioned this pull request Jun 25, 2024
Merged
24 tasks
emerick added a commit that referenced this pull request Jun 25, 2024
@emerick
Merge pull request #23829 from brave/cr127
61f37ca 
Upgrade from Chromium 126 to Chromium 127
@mkarolin
Copy link
Collaborator

mkarolin commented Jun 28, 2024 •
edited
Loading

When uplifting also uplift these:

mkarolin pushed a commit that referenced this pull request Jul 2, 2024
@emerick @mkarolin
Merge pull request #23829 from brave/cr127
7a201f5 
Upgrade from Chromium 126 to Chromium 127
kjozwiak pushed a commit that referenced this pull request Jul 3, 2024
@emerick @goodov
@simonhong @mkarolin @samartnik
Upgrade from Chromium 126 to Chromium 127 (uplift to 1.68.x). (#24372)
e54671f 
* Merge pull request #23829 from brave/cr127

Upgrade from Chromium 126 to Chromium 127

* Support IndexedHostContentSettingsMap feature in Brave provider. (#24027)

* Use NOTREACHED_NORETURN in domain block throttle. (#24292)

* Fixed omnibox flickering with download toolbar button toggle

fix brave/brave-browser#39373

Our download button used smaller image size than other toolbar buttons.
Set same icon size with other toolbar buttons.

* Merge pull request #24391 from brave/cr127-followup-remove-redundant-sidepanel-settings

Remove redundant side panel settings

* Merge pull request #24394 from brave/127.0.6533.26_master

Upgrade from Chromium 127.0.6533.17 to Chromium 127.0.6533.26

* Merge pull request #24422 from brave/fix_app_menu_button_upgrade_alert_regression

Fix app menu button upgrade alert regression

* Merge pull request #24412 from brave/android_tablet_ntp_fix

[C127] [Android] Fix for tablet NTP crash

* Merge pull request #24425 from brave/android_tablet_no_tabs_ui_fix

[C127] [Android] Fix for tablet overview UI with no tabs

* Merge pull request #24428 from brave/maxk-hide-history-groups-menu-item

Hides Grouped History menu item.

* Merge pull request #24460 from brave/android_webapps_branding_fix

[C127] [Android] Fix for web app branding icon and string

---------

Co-authored-by: goodov <5928869+goodov@users.noreply.github.com>
Co-authored-by: Simon Hong <shong@brave.com>
Co-authored-by: Max Karolinskiy <41635752+mkarolin@users.noreply.github.com>
Co-authored-by: samartnik <30602739+samartnik@users.noreply.github.com>
@josheleonard josheleonard mentioned this pull request Jul 18, 2024
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kylehickinson kylehickinson kylehickinson approved these changes

@github-actions github-actions[bot] github-actions[bot] left review comments

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

@samartnik samartnik samartnik left review comments

@darkdh darkdh darkdh approved these changes

@zenparsing zenparsing zenparsing approved these changes

@thypon thypon thypon left review comments

@deeppandya deeppandya deeppandya approved these changes

@StephenHeaps StephenHeaps StephenHeaps approved these changes

@DJAndries DJAndries DJAndries approved these changes

@goodov goodov goodov approved these changes

@bsclifton bsclifton bsclifton approved these changes

@simonhong simonhong simonhong approved these changes

@iefremov iefremov iefremov approved these changes

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

@josheleonard josheleonard josheleonard approved these changes

@tmancey tmancey tmancey approved these changes

@mkarolin mkarolin mkarolin approved these changes

@bridiver bridiver bridiver approved these changes

Assignees

@thypon thypon

@iefremov iefremov

@emerick emerick

@bcaller bcaller

@goodov goodov

@samartnik samartnik

@cdesouza-chromium cdesouza-chromium

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 needs-security-review
Projects
None yet
Milestone
1.69.x - Release
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 126 to Chromium 127