Skip to content

Upgrade from Chromium 110 to Chromium 111. #17033

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

Merged
merged 139 commits into from
Feb 23, 2023
Merged

Upgrade from Chromium 110 to Chromium 111. #17033

merged 139 commits into from
Feb 23, 2023

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Feb 3, 2023

Resolves brave/brave-browser#28288

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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 lint, 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) labels Feb 3, 2023
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false labels Feb 3, 2023
@cdesouza-chromium cdesouza-chromium force-pushed the cr111 branch 6 times, most recently from 11999bb to b0cc139 Compare February 10, 2023 12:14
@emerick emerick force-pushed the cr111 branch 4 times, most recently from ae0bf3f to 33ebe88 Compare February 11, 2023 16:56
@brave-builds
Copy link
Collaborator

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

@socket-security
Copy link

socket-security bot commented Feb 14, 2023

Socket Security Pull Request Report

👍 No new dependency issues detected in pull request

Pull request report summary
Issue Status
Install scripts ✅ 0 issues
Native code ✅ 0 issues
Bin script confusion ✅ 0 issues
Bin script shell injection ✅ 0 issues
Unresolved require ✅ 0 issues
Invalid package.json ✅ 0 issues
HTTP dependency ✅ 0 issues
Git dependency ✅ 0 issues
Potential typo squat ✅ 0 issues
Known Malware ✅ 0 issues
Telemetry ✅ 0 issues
Protestware/Troll package ✅ 0 issues
Bot Commands

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore [email protected] [email protected]

Powered by socket.dev

@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 emerick force-pushed the cr111 branch 3 times, most recently from eb575a1 to acfecfe Compare February 15, 2023 16:18
cdesouza-chromium and others added 20 commits February 22, 2023 06:30
Chromium change:

https://chromium.googlesource.com/chromium/src/+/90b71323a7048e2eba0a2d9c09fb6b501140495a

commit 90b71323a7048e2eba0a2d9c09fb6b501140495a
Author: Yann Dago <[email protected]>
Date:   Wed Oct 19 20:56:28 2022 +0000

    Switch to yaml for policy templates

    Bug: 1294298
Chromium change:
https://chromium.googlesource.com/chromium/src/+/db38b1c1c0c12bee94f2b58ca5d8f74245059fec

commit db38b1c1c0c12bee94f2b58ca5d8f74245059fec
Author: Xianzhu Wang <[email protected]>
Date:   Fri Jan 20 07:05:56 2023 +0000

    Combine hash functions and traits, all remaining

    See crrev.com/c/4160442 for more context.

    Bug: 1374475
A header that was not part of the svg target for iOS started causing
failures when running gn checks.
Error fixed:
//components/*
ERROR at //components/cdm/renderer/android_key_system_info.cc:13:11: Can't include this header from here.
          ^---------------------------------------------
The target:
  //components/cdm/renderer:renderer
is including a file from the target:
  //third_party/widevine/cdm:headers

It's usually best to depend directly on the destination target.
In some cases, the destination target is considered a subcomponent
of an intermediate target. In this case, the intermediate target
should depend publicly on the destination to forward the ability
to include headers.

Dependency chain (there may also be others):
  //components/cdm/renderer:renderer -->
  //content/public/renderer:renderer -->
  //content/public/renderer:renderer_sources --[private]-->
  //third_party/widevine/cdm:headers

Chromium change:
chromium/chromium@598dc64

Move AndroidKeySystemInfo into it's own file
Also updates the class to allow support for hardware secure codecs and
encryption scheme support.

Bug: 853336
New name more accurately reflects what our class does.
Chromium change:

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

commit e8e70828ce334fed69b7387a85b162822c5534f7
Author: Max Curran <[email protected]>
Date:   Tue Jan 10 20:27:51 2023 +0000

    Settings: Update desktop preloading setting

    This CL updates the preloading setting on desktop to bring it in line
    with the setting on Android. This allows the user to select from no
    preloading, standard preloading, and extended preloading. The strings
    used in the new desktop settings are the planned strings for an upcoming
    update to the Privacy Guide.

    The CL also updates the related histogram to record all possible
    settings.

    Original Proposal:
    https://docs.google.com/document/d/1LZhn20pGHQSrYwmlGTZVcwLgIpggGjCYyKFD4lX3B4g/edit?usp=sharing&resourcekey=0-2b7gamlYhDFHsPN-YF09oQ

    Privacy Guide Strings: https://docs.google.com/document/d/14n-_5UNR0u5G5s1ZwcKvdF0xPevpkNIDoD4omHd7zmA/edit?usp=sharing

    Screenshots: https://bugs.chromium.org/p/chromium/issues/detail?id=1385176#c3

    Bug: 1385176
@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 emerick merged commit 0b6268c into master Feb 23, 2023
@emerick emerick deleted the cr111 branch February 23, 2023 02:20
@emerick emerick added this to the 1.50.x - Nightly milestone Feb 23, 2023
emerick added a commit that referenced this pull request Feb 23, 2023
kjozwiak pushed a commit that referenced this pull request Mar 1, 2023
* Merge pull request #17033 from brave/cr111

* Partial refactor of PageGraph to use WTF types (#16953)

This is a partial refactor of PageGraph to make use of WTF types where
possible. A much larger change enforcing the use of WTF::String will be
submitted separately. The changes in this PR are aiming in making that
work easier.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/52472aba170b71f97ae9ab17f429ff494537adae

commit 52472aba170b71f97ae9ab17f429ff494537adae
Author: Xianzhu Wang <[email protected]>
Date:   Mon Jan 9 20:26:58 2023 +0000

    Enable discouraged type check for data members under blink/renderer

    For existing usages of discouraged type:
    - Simple cases are changed to use blink types;
    - For other cases, ALLOW_DISCOURAGED_TYPE(reason) is added.

    Rules audit_non_blink_usages.py checking such usages are removed.
    We'll use the clang plugin from now on.

    Bug: 1363780

* Using WTF::String for blink data members (#16988)

Upstream chromium has rolled out clang checks in upcoming versions that
will error out in cases where blink headers are using `std::string` as
data member type.

This change replaces all uses of `std::string` with `WTF::String` for
data members in blink headers.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/52472aba170b71f97ae9ab17f429ff494537adae

commit 52472aba170b71f97ae9ab17f429ff494537adae
Author: Xianzhu Wang <[email protected]>
Date:   Mon Jan 9 20:26:58 2023 +0000

    Enable discouraged type check for data members under blink/renderer

    For existing usages of discouraged type:
    - Simple cases are changed to use blink types;
    - For other cases, ALLOW_DISCOURAGED_TYPE(reason) is added.

    Rules audit_non_blink_usages.py checking such usages are removed.
    We'll use the clang plugin from now on.

    Bug: 1363780
    Change-Id: I808524abc06c24d8f0f9867c06f4c6597bff1889
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4130490
    Commit-Queue: Xianzhu Wang <[email protected]>
    Reviewed-by: Daniel Cheng <[email protected]>
    Reviewed-by: Chris Harrelson <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#1090474}

* Merge pull request #17389 from brave/cr111-followup-fix-missing-shield-settings-header

Fix missing Shield settings header

* Merge pull request #17390 from brave/cr111-followup-fix-missing-ethereum-permissions-header

Fix missing Ethereum permissions header

* Upgrade from Chromium 111.0.5563.33 to Chromium 111.0.5563.41 (#17349)

* Upgrade from Chromium 111.0.5563.33 to Chromium 111.0.5563.41

* Upgrade patches from Chromium 111.0.5563.33 to Chromium 111.0.5563.41

* Update pins list timestamp

* Disable new DIPS-related upstream unit test

---------

Co-authored-by: brave-builds <[email protected]>

* [Android] Fix for rotation of NTP images

* Resolve rewards ANR with external wallet provider

---------

Co-authored-by: cdesouza-chromium <[email protected]>
Co-authored-by: brave-builds <[email protected]>
Co-authored-by: Artem Samoilenko <[email protected]>
Co-authored-by: deeppandya <[email protected]>
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 potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 110 to Chromium 111