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 125 to Chromium 126 #23233

Merged
merged 129 commits into from
May 24, 2024
Merged

Upgrade from Chromium 125 to Chromium 126 #23233

merged 129 commits into from
May 24, 2024

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Apr 23, 2024

Resolves brave/brave-browser#37788

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 Apr 29, 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

@brave-builds
Copy link
Collaborator

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

cdesouza-chromium and others added 20 commits May 24, 2024 09:45
This argument used to be a string. This change corrects all references
to use the new enum values.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/42390c5321b3c6c586123c49b5dcca8ac7c0b2a1

commit 42390c5321b3c6c586123c49b5dcca8ac7c0b2a1
Author: Christian Dullweber <dullweber@chromium.org>
Date:   Fri May 10 18:51:57 2024 +0000

    ContentSettings: Remove string provider name

    Replace string provider name with ProviderType enum and remove
    conversion methods.

    Bug: 40538766
This flag is not being passed anymore, and therefore doesn't need to be
checked against as it was the case.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/705060d44865a923ed15e1f9a38a10234df4c79e

commit 705060d44865a923ed15e1f9a38a10234df4c79e
Author: Andreas Haas <ahaas@chromium.org>
Date:   Fri May 10 05:06:00 2024 +0000

    [v8] Clean up no_alloc_direct_call_for_testing

    V8 fast calls can now allocate objects, trigger GC, call back to
    JavaScript, and throw exceptions. Therefore there is no need anymore for
    tests that check that API functions called by fast V8 calls don't do
    these things.

    Bug: 41492790
This component now has a visibility list entry, that requires listing,
and therefore a patch is being added.

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

commit afe7ee3030f21235dddaac5f2fbcbfac605ff799
Author: dpapad <dpapad@chromium.org>
Date:   Mon May 13 19:20:35 2024 +0000

    WebUI: Restrict visibility of //third_party/polymer/v3_0:library target.

    This is in preparation of making Lit the recommended framework for new
    Desktop WebUI development.

    Any new targets depending on Polymer will have to explicitly be added
    to the list. Once the guidance to require Lit for new development is in
    effect, no new additions/exceptions will be allowed.

    Bug: 40943652
…ed parameter anymore

Related Chromium change:
	[SurfacePolish][CleanUp] Clean up surface polish code related with SURFACE_POLISH_LESS_BRAND_SPACE_PARAM parameter.

	Clean up surface polish code related with
	SURFACE_POLISH_LESS_BRAND_SPACE_PARAM parameter.

	Bug: 331667743
	Change-Id: Id575285bd8d903e067e4c8c7a8edf6a433cafa16
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5530104
Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/a90215339806ae4f6a512a63d84fa06063c7f3ff

	[SurfacePolish][CleanUp] Clean up surface polish code related with SURFACE_POLISH_LESS_BRAND_SPACE_PARAM parameter.

	Clean up surface polish code related with
	SURFACE_POLISH_LESS_BRAND_SPACE_PARAM parameter.

	Bug: 331667743
	Change-Id: Id575285bd8d903e067e4c8c7a8edf6a433cafa16
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5530104
…ated

Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/a3bca21ae74b12a3373b7df0e51d46a19c8b872a

	Modularize webui_util.h

	Several desktop-only methods are moved to webui_util_desktop. These
	methods are marked as deprecated, as they use disallowed methods.

	Bug: 339497734
	Change-Id: I5f58ab882b8325581ec66290f69c98131fb3b6af
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5528814
This icon shows up as the Page Info icon for brave://settings, among other places.

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

commit b2294323445cdef22b355708c6b4b691235c9804
Author: Emily Shack <emshack@chromium.org>
Date:   Tue May 7 20:03:21 2024 +0000

    Remove CustomizeChromeSupportsChromeRefresh2023

    Also removes a test hack that was causing failures with these changes.
    The flags referenced in that hack are also getting cleaned up
    concurrently, and should no longer ever be false.

    Additionally, removes kCustomizeChromeSidePanelNoChromeRefresh2023,
    which is no longer used.

    #chrome-refresh-2023-cleanup

    Bug: 335903631, 335904195, 41492974
…password store.

Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/d8a8c88e167001e6262883973dac7fed724c7a7e

	Reland "[UPM] Always set use_login_database_as_backend to false for android"

	This is a reland of commit 6183fd7d4b080a7a70ecaf123408d86101ebfdec

	The CL was reverted because of the tests breakage. The reason for that
	was that one of the bots had an outdated GMS Core version. The problem
	was fixed in the CL crrev.com/c/5490111.

	Original change's description:
	> [UPM] Always set use_login_database_as_backend to false for android
	>
	> IMPORTANT: Using the login database on Android will be deprecated in
	> about 6 months. This CL makes using the GMS Core for password storing
	> the default approach.
	>
	> chrome_public_apk can still be built with the login database by setting
	> the argument use_login_database_as_backend=true in the args.gn.
	> The default value of use_login_database_as_backend is set to false on
	> Android in this CL.
	>
	> The increase of binary size is taking place because the build flag value is changed, which causes our feature code to be compiled for Chromium builds now. Chrome builds already contain the code, so for those, this change is a no-op.
	>
	> Bug: 331746629
	> Binary-Size: Size increase is unavoidable (see above)
	> Change-Id: Ibf3fe2d6c63bae521496d722ceebe7d0b4ac41d2
	> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5402473
	> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
	> Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
	> Commit-Queue: Anna Tsvirchkova <atsvirchkova@google.com>
	> Cr-Commit-Position: refs/heads/main@{#1292307}

	Bug: 331746629
	Binary-Size: Size increase is unavoidable (see above)
	Change-Id: I0f62a2dc0a4c764fef738995eeae666af06f9653
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5493819
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/67a610e6329dc0bdc58408725a044871f460fa59

commit 67a610e6329dc0bdc58408725a044871f460fa59
Author: Jong Ahn <jongahn@google.com>
Date:   Tue May 7 00:43:47 2024 +0000

    [Structured Metrics]: Remove old nearby share feature flag.

    It has been some time since this has launched so removing feature flag.

    Bug: 336801244
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/153730cf46e506f9306cee4896f66a8314661188

commit 153730cf46e506f9306cee4896f66a8314661188
Author: Joshua Pawlicki <waffles@chromium.org>
Date:   Tue Apr 16 15:14:57 2024 +0000

    Reland "Chrome/Updater: Use the updater scheduler to ensure updater presence."

    This is a reland of commit 6c8d9f199eb403213d463b85787040c0f4736580
    The original CL is patchset 1.

    Original change's description:
    > Chrome/Updater: Use the updater scheduler to ensure updater presence.
    >
    > The goal of this CL is to simplify and consolidate the number of flows
    > that lead to installation of the updater. This reduces contention on
    > the updater locks, etc, and may improve the startup performance of
    > Chrome and the reliability of the promotion infobar. These changes have
    > the following effects:
    >
    > 1. Installation of the updater and registration of Chrome will happen
    >    19 seconds after browser startup, rather than twice during message
    >    loop and UI pre-initialization.
    > 2. The promotion infobar will be shown at that time, if necessary,
    >    rather than right away. This is beneficial in some cases since
    >    previously the infobar wouldn't be shown in cases where the profile
    >    selection dialog is shown.
    > 3. The infobar will be shown on the first run of Chrome if needed.
    > 4. The infobar will shown several hours into the browsing session if
    >    it did not previously show, or if things have changed and promotion
    >    is now needed.
    >
    > There is still one other path to EnsureUpdater that I did not alter
    > here - if Chrome is restarted with a chrome://help tab open, that tab
    > will initiate an on-demand update check, installing the updater if
    > necessary. Multiple such tabs might cause contention on the locks, but
    > do not cause any errors. Performance issues associated with that seem
    > infrequent and don't justify additional complexity in my opinion.
    >
    > Fixed: b/332911252
    > Change-Id: Ibdef62b1807f25e7cddaf8f41ab37ca2499cf969
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5425369
    > Auto-Submit: Joshua Pawlicki <waffles@chromium.org>
    > Reviewed-by: Mark Mentovai <mark@chromium.org>
    > Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
    > Reviewed-by: Greg Thompson <grt@chromium.org>
    > Cr-Commit-Position: refs/heads/main@{#1287969}

    Change-Id: If70f187f22e2ea3b557d6430e5af5afcfe3d88fe
The necessary substitution for the side panel type doesn't propagate to
browser tests. This change adds an override to account for it in this
new test.

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

commit 6af23c1169286add9ccffde22ace7e4781efb981
Author: Duncan Mercer <mercerd@google.com>
Date:   Thu May 16 00:50:34 2024 +0000

    Reland "[lensoverlay] Fix side panel interactions"

    This reverts commit d55b86a5ac50f4ef75d71be5a2e955b1c4dd4aeb.

    Reason for revert: Disabled failing tests for ChromeOS.

    Original change's description:
    > Revert "[lensoverlay] Fix side panel interactions"
    >
    > This reverts commit d5923aacfdaeb3c86cb09269c9e819e1348f3c08.
    >
    > Reason for revert: Linux MSan failures
    >
    > Original change's description:
    > > [lensoverlay] Fix side panel interactions
    > >
    > > 1) If a side panel is open when the overlay is invoked, we
    > >    close it and wait for it to close before taking a
    > >    screenshot. This plays the side panel sliding close
    > >    animation which refows the page so it is ready for the
    > >    screenshot.
    > > 2) When we are closing the overlay, if our side panel is open,
    > >    we wait close it and wait for it to finish closing before
    > >    hiding the overlay. This allows our overlay to smoothly grow
    > >    before hiding, making a less jarring transition.
    > >
    > > Since we are relying on events from the side panel, and other
    > > clients of the side panel can interrupt the sequence we are
    > > waiting for, it is important we never get in a stuck state. To do
    > > this, I added a closing interrupted event, which notifies us if
    > > the side panel was closing but got reopened. With this close
    > > interrupted event, along with precise state tracking in the
    > > overlay, the overlay should be robust enough to not get stuck
    > > waiting for side panel close/open.
    > >
    > > Bug: b:337344507, b:328296424
    > > Change-Id: I5e9755e2d51831a79ce825a6d5cd6bbc042bf2c9
    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5534998
    > > Reviewed-by: Thomas Lukaszewicz <tluk@chromium.org>
    > > Reviewed-by: Mark Pearson <mpearson@chromium.org>
    > > Commit-Queue: Duncan Mercer <mercerd@google.com>
    > > Reviewed-by: Erik Chen <erikchen@chromium.org>
    > > Cr-Commit-Position: refs/heads/main@{#1301006}
    >
    > Bug: b:337344507, b:328296424
    > Change-Id: I499b9347691d361c9c7d45873679aeca73ac1b31
    > No-Presubmit: true
    > No-Tree-Checks: true
    > No-Try: true
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5541053
    > Commit-Queue: Kalvin Lee <kdlee@chromium.org>
    > Owners-Override: Kalvin Lee <kdlee@chromium.org>
    > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
    > Cr-Commit-Position: refs/heads/main@{#1301114}

    Bug: b:337344507, b:328296424
This change also replaces `obsoleted` with `deprecated` for iOS 16 marked types to produce warnings instead of errors for references to those types
fixes brave/brave-browser#38524

Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/d185bd9ea3aa006e8dfc789dce07f3d902886c9a

[Android] Allow CachedFlags to specify test defaults

	This mimics fieldtrial_testing_config.json for CachedFlag in tests.
	It does not affect the flag value in developer builds like
	fieldtrial_testing_config.json does, however.

	Bug: 40239922
	Change-Id: I8b67a6c2feeadd5ce12dcf6d41fe4c2e3e3d240f
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5523173
@brave-builds
Copy link
Collaborator

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

@emerick emerick merged commit 8e27e1c into master May 24, 2024
19 checks passed
@emerick emerick deleted the cr126 branch May 24, 2024 16:10
@github-actions github-actions bot added this to the 1.68.x - Nightly milestone May 24, 2024
emerick added a commit that referenced this pull request May 24, 2024
Upgrade from Chromium 125 to Chromium 126
emerick added a commit that referenced this pull request May 24, 2024
Upgrade from Chromium 125 to Chromium 126
emerick added a commit that referenced this pull request May 25, 2024
Upgrade from Chromium 125 to Chromium 126
emerick added a commit that referenced this pull request May 25, 2024
Upgrade from Chromium 125 to Chromium 126
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/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet
Projects
None yet