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 95 to Chromium 96 #10100

Merged
merged 104 commits into from
Nov 3, 2021
Merged

Upgrade from Chromium 95 to Chromium 96 #10100

merged 104 commits into from
Nov 3, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Sep 15, 2021

Fixes brave/brave-browser#18131
Related PR: brave/brave-browser#18133

Also,
Fixes brave/brave-browser#19094

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
  • 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, npm run lint, 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:

goodov and others added 20 commits November 2, 2021 12:41
We use this kind of origins to access ephemeral localStorage areas.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/15249fcb16cc53f70c8e492124ac5d1453a66588

commit 15249fcb16cc53f70c8e492124ac5d1453a66588
Author: Ari Chivukula <[email protected]>
Date:   Fri Oct 1 22:02:52 2021 +0000

    [DOM Storage + StorageKey] (3c) Add LocalFrameToken to IPC and verify

    This is the most dangerous change: causing a fatal error if the
    LocalFrameToken sent exists but doesn't match the process id.

    The prior attempt at this change (https://crrev.com/c/3122751). Took a
    quick and dirty approach which required a revert. This code is on a
    critical path, has a lot of quick fixes layered, and is under-tested.
    Let's take a slower approach as follows:
    (1) Refactor session and local storage checks
    (2) Add StorageKey to IPC
    (3) Add LocalFrameToken to IPC and verify

    Bug: 1212808
Adds all current CH feature switches to the test to make sure the
feature switch state doesn't affect disablement of CH in Brave.

Alphabetized CH headers in the test data.
Per security team.

Enterprise policy override switch is NOT disabled.

Chromium change:

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

commit fec3a66ed2a6db4729060315db9120f91b44bf4b
Author: Ari Chivukula <[email protected]>
Date:   Mon Sep 27 22:04:11 2021 +0000

    [WebSQL] (1) Add feature to disable third party context WebSQL

    In preparation for M96 we want to add a flag to disable third party
    WebSQL (which defaults to off) and an enterprise policy that can
    override that. In M97 this flag will default to enabled.
    (1) Add feature to disable third party context WebSQL
    (2) Add enterprise policy to restore third party context WebSQL

    Bug: 1212491
Per security team.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/4359c5ebd238c93c22e69d369cbe813ae3081b6c

commit 4359c5ebd238c93c22e69d369cbe813ae3081b6c
Author: Brandon Maslen <[email protected]>
Date:   Mon Sep 27 20:32:05 2021 +0000

    Rename InterestGroup API flag for common use and add flag for PARAKEET impl

    Update the FledgeInterestGroupAPI flag/policy to be a more generic
    AdInterestGroupAPI for shared usage between multiple ad serving features.

    Updates the FledgeInterestGroups flag for backend storage to be
    a more generic 'InterestGroupStorage'.

    Also splits the specific ad serving API methods under two new runtime
    flags 'Fledge', blink::features::kFledge, and 'Parakeet',
    blink::features::kParakeet. For PARAKEET the method stubs have been
    added but will be fully fleshed out with proper types in a subsequent
    change.

    Test collateral has been updated to ensure the new surface area is
    available and callable.

    Bug: 1249186
Per security team.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/519bb90d99ba0eecbe914d7fcaf1da760310a9ec

commit 519bb90d99ba0eecbe914d7fcaf1da760310a9ec
Author: Nicolás Peña Moreno <[email protected]>
Date:   Fri Oct 1 19:56:51 2021 +0000

    Enable all JS framework reporting by default

    Bug: 1006274
Per security team.

Also, disables origin trials and a related
kSpeculationRulesPrefetchProxy feature.

Chromium change:

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

commit d22042e30d6dc42081b01d0c0cc31f9f49dd2d64
Author: Simon Pelchat <[email protected]>
Date:   Thu Sep 30 19:57:51 2021 +0000

    Enable SpeculationRulesPrefetchProxy by default on Android only.

    Note that this feature is still gated behind origin trial and has not actually been launched.

    Bug: 1022055
Changed timing for calling GetNativeTheme().
It should be called after NativeTheme is available for view.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/93850eca7ee7369c0600f9558649d521b8f6d2eb

commit 93850eca7ee7369c0600f9558649d521b8f6d2eb
Author: tom <[email protected]>
Date: Mon Jul 19 17:39:29 2021

[views] Add CHECK to prevent fallthrough to global NativeTheme

This CL adds a CHECK to View::GetNativeTheme() to catch any
remaining fallthrough to the global NativeTheme instance.

Bug: 1056756
The buttons used for the Brave VPN in the toolbar and app menu were
lacking an accessible name, which was triggering a crash on startup
on DCHECK-enabled builds.

Chromium change:

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

commit a62d2cead48795f0cfc53d35dcdca66f4e236bb3
Author: Peter Boström <[email protected]>
Date:   Thu Oct 7 21:14:44 2021 +0000

    Reland "Enable Views OnPaint() A11y DCHECKs"

    This reverts commit 32985fb4404d1c7aa41053d8f4d21ed729afbb98.

    Reason for revert: Relanding with additional skip-check annotations.

    Original change's description:
    > Revert "Enable Views OnPaint() A11y DCHECKs"
    >
    > This reverts commit c95dcbbb8ef6577342acfd2d9a3a0af9ee54502b.
    >
    > Reason for revert: Suspected culprit for failures on linux-chromeos-dbg. https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-dbg/25787/overview
    >
    >
    > Original change's description:
    > > Enable Views OnPaint() A11y DCHECKs
    > >
    > > This annotates MessageBoxView which was the hard-to-find culprit of
    > > ChromeDriverTest.testSendTextToAlert. Presumably the test is set up to
    > > generate display a zero-length message?
    > >
    > > This change is likely to get reverted as more issues are found in the
    > > field. If you see this commit because your specific UI/dialog started
    > > crashing, please see views::kSkipAccessibilityPaintChecks to temporarily
    > > disable the DCHECK for your UI rather than reverting the mechanism for
    > > detecting these errors. Do follow that up with removal of that property
    > > and make sure that focusable UI always has accessible names that can be
    > > read by screenreaders.
    > >
    > > Bug: 1218186
    > > Change-Id: Id5e19fa7ccca844c599740b6849a3721604a5ee8
    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3209106
    > > Reviewed-by: Scott Violet <[email protected]>
    > > Commit-Queue: Scott Violet <[email protected]>
    > > Commit-Queue: Peter Boström <[email protected]>
    > > Auto-Submit: Peter Boström <[email protected]>
    > > Cr-Commit-Position: refs/heads/main@{#928920}
    >
    > Bug: 1218186
    > Change-Id: I9abaef4c2abfa1d853be8933d700e11a727dbc97
    > No-Presubmit: true
    > No-Tree-Checks: true
    > No-Try: true
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3210369
    > Reviewed-by: Meredith Lane <[email protected]>
    > Reviewed-by: Nancy Wang <[email protected]>
    > Owners-Override: Meredith Lane <[email protected]>
    > Auto-Submit: Meredith Lane <[email protected]>
    > Bot-Commit: Rubber Stamper <[email protected]>
    > Commit-Queue: Nancy Wang <[email protected]>
    > Cr-Commit-Position: refs/heads/main@{#929035}

    Bug: 1218186
The combobox used for the permission lifetime prompt was lacking an accessible
name, which was triggering a crash on DCHECK-enabled builds.

Chromium change:

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

commit a62d2cead48795f0cfc53d35dcdca66f4e236bb3
Author: Peter Boström <[email protected]>
Date:   Thu Oct 7 21:14:44 2021 +0000

    Reland "Enable Views OnPaint() A11y DCHECKs"

    This reverts commit 32985fb4404d1c7aa41053d8f4d21ed729afbb98.

    Reason for revert: Relanding with additional skip-check annotations.

    Original change's description:
    > Revert "Enable Views OnPaint() A11y DCHECKs"
    >
    > This reverts commit c95dcbbb8ef6577342acfd2d9a3a0af9ee54502b.
    >
    > Reason for revert: Suspected culprit for failures on linux-chromeos-dbg. https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-dbg/25787/overview
    >
    >
    > Original change's description:
    > > Enable Views OnPaint() A11y DCHECKs
    > >
    > > This annotates MessageBoxView which was the hard-to-find culprit of
    > > ChromeDriverTest.testSendTextToAlert. Presumably the test is set up to
    > > generate display a zero-length message?
    > >
    > > This change is likely to get reverted as more issues are found in the
    > > field. If you see this commit because your specific UI/dialog started
    > > crashing, please see views::kSkipAccessibilityPaintChecks to temporarily
    > > disable the DCHECK for your UI rather than reverting the mechanism for
    > > detecting these errors. Do follow that up with removal of that property
    > > and make sure that focusable UI always has accessible names that can be
    > > read by screenreaders.
    > >
    > > Bug: 1218186
    > > Change-Id: Id5e19fa7ccca844c599740b6849a3721604a5ee8
    > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3209106
    > > Reviewed-by: Scott Violet <[email protected]>
    > > Commit-Queue: Scott Violet <[email protected]>
    > > Commit-Queue: Peter Boström <[email protected]>
    > > Auto-Submit: Peter Boström <[email protected]>
    > > Cr-Commit-Position: refs/heads/main@{#928920}
    >
    > Bug: 1218186
    > Change-Id: I9abaef4c2abfa1d853be8933d700e11a727dbc97
    > No-Presubmit: true
    > No-Tree-Checks: true
    > No-Try: true
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3210369
    > Reviewed-by: Meredith Lane <[email protected]>
    > Reviewed-by: Nancy Wang <[email protected]>
    > Owners-Override: Meredith Lane <[email protected]>
    > Auto-Submit: Meredith Lane <[email protected]>
    > Bot-Commit: Rubber Stamper <[email protected]>
    > Commit-Queue: Nancy Wang <[email protected]>
    > Cr-Commit-Position: refs/heads/main@{#929035}

    Bug: 1218186
Chromium change;
chromium/chromium@b364155

Enable ThemeRefactorAndroid by default.
Bug: 1251194
@bsclifton bsclifton merged commit f78efb2 into master Nov 3, 2021
@bsclifton bsclifton deleted the cr96 branch November 3, 2021 18:17
@mkarolin mkarolin added this to the 1.33.x - Nightly milestone Nov 3, 2021
mkarolin pushed a commit that referenced this pull request Nov 4, 2021
Upgrade from Chromium 95 to Chromium 96
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CR96 - History is not shown in clean and upgraded profile Upgrade from Chromium 95 to Chromium 96