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 87 to Chromium 88.0.4324.79 (1.19.x). #7518

Merged
merged 16 commits into from
Jan 13, 2021
Merged

Upgrade from Chromium 87 to Chromium 88.0.4324.79 (1.19.x). #7518

merged 16 commits into from
Jan 13, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Jan 4, 2021 •
edited
Loading

Fixes brave/brave-browser#12331
Fixes brave/brave-browser#13130
Fixes brave/brave-browser#13203
Fixes brave/brave-browser#13281
Fixes brave/brave-browser#13103
Fixes brave/brave-browser#13427
Fixes brave/brave-browser#13443

Related PR: brave/brave-browser#13365
Uplift from #6957
Uplift from #7399
Uplift from #7440
Uplift from #7491
Uplift from #7408
Uplift from #7544
Uplift from #7549

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • 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).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • 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 the CI/run-network-audit Run network-audit label Jan 4, 2021
@mkarolin mkarolin requested a review from a team January 4, 2021 21:02
@mkarolin mkarolin self-assigned this Jan 4, 2021
@mkarolin mkarolin requested review from tmancey and a team as code owners January 4, 2021 21:02
@mkarolin mkarolin requested review from marshall and emerick and removed request for a team January 4, 2021 21:02
@mkarolin mkarolin mentioned this pull request Jan 4, 2021
Merged
23 tasks
@mkarolin mkarolin changed the title Upgrade from Chromium 87 to Chromium 88.0.4315.7 (1.19.x). WIP: Upgrade from Chromium 87 to Chromium 88.0.4315.7 (1.19.x). Jan 4, 2021
emerick
emerick approved these changes Jan 5, 2021
View reviewed changes
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

Rewards changes look good.

@mkarolin mkarolin changed the title WIP: Upgrade from Chromium 87 to Chromium 88.0.4315.7 (1.19.x). WIP: Upgrade from Chromium 87 to Chromium 88.0.4324.79 (1.19.x). Jan 8, 2021
@mkarolin mkarolin changed the title WIP: Upgrade from Chromium 87 to Chromium 88.0.4324.79 (1.19.x). Upgrade from Chromium 87 to Chromium 88.0.4324.79 (1.19.x). Jan 11, 2021
kylehickinson
kylehickinson approved these changes Jan 11, 2021
View reviewed changes
Copy link
Collaborator

@kylehickinson kylehickinson left a comment

Choose a reason for hiding this comment

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

iOS++

@mkarolin mkarolin added CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Jan 11, 2021
@mkarolin
Copy link
Collaborator Author

CI:

  • post-init: a known audit_deps failure (smallvec) - unrelated to the PR
  • Linux: failed audit-network with a known unrelated to the PR error
  • MacOS: browser test failed: RewardsBrowserTest.UpholdLimitNoBAT
  • Windows: browser tests timing out - will rerun.
  • iOS: build failure - will rerun after fixing
    Will rerun CI only for Windows and iOS.

@mkarolin mkarolin removed CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Jan 12, 2021
mkarolin and others added 16 commits January 11, 2021 23:02
@mkarolin
Merge pull request #6957 from brave/cr88
3756343 
Upgrade from Chromium 87 to Chromium 88.
@mihaiplesa @mkarolin
Merge pull request #7399 from brave/maxk-fix-mac-signing
46ebb56 
Output dir of signing on mac changed.
@mkarolin
Merge pull request #7440 from brave/maxk-fix-brave-toolbar-buttons
41ffc75 
cr88 followup: Fixes Bookmark & Speed Reader buttons.
@mkarolin
Merge pull request #7491 from brave/88.0.4315.7
eb00c68 
Updated patches from Chromium 88.0.4315.5 to Chromium 88.0.4315.7.
@mkarolin
Merge pull request #7408 from brave/cr88
0cf8f35 
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
@bbondy @mkarolin
Merge pull request #7544 from brave/88.0.4324.79
aed75a9 
Updated patches from Chromium 88.0.4324.51 to Chromium 88.0.4324.79
@bsclifton @mkarolin
Merge pull request #7549 from brave/ie_drop_fpv1
eb7a674 
13443: Drop fingerprinting V1 shields settings.
@mkarolin
Updated patches after cherry-picking cr88 into 1.19.x.
ff121e6
@mkarolin
cr88 -> 1.19.x: Replace usage of is_desktop_linux with is_linux
a01becb 
Chromium change:

https://chromium.googlesource.com/chromium/src.git/+/ff566eb65da7fc13e18731287a8100e36db6972a

commit ff566eb65da7fc13e18731287a8100e36db6972a
Author: Xiaohan Wang <xhwang@chromium.org>
Date:   Mon Oct 12 19:11:41 2020 +0000

    build: Remove `is_desktop_linux` GN arg

    This is now defined the same as `is_linux` and is no longer needed.

    Bug: 1132395
@mkarolin
cr88 -> 1.19.x: ExtensionFunction::OneArgument sig. changed.
2cd22bc 
Chromiun changes:

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

commit f0a92a052a1e3b60ce510650fb7f1120ef6ee9ca
Author: Lei Zhang <thestig@chromium.org>
Date:   Fri Oct 23 01:00:51 2020 +0000

    Add a form of ExtensionFunction::OneArgument() that takes a base::Value.

    Instead of taking std::unique_ptr<base::Value>. Mechanically convert
    many callers from OneArgument(std::make_unique<base::Value>(...)) to
    OneArgument(base::Value(...)).

    Bug: 1139221

https://source.chromium.org/chromium/chromium/src/+/71dc58d5aa15ff3a94629d8aa9d0b41c18503ffb

commit 71dc58d5aa15ff3a94629d8aa9d0b41c18503ffb
Author: Lei Zhang <thestig@chromium.org>
Date:   Mon Oct 26 18:37:05 2020 +0000

    Remove deprecated form of ExtensionFunction::OneArgument().

    Use base::Value::FromUniquePtrValue() in many case to get a base::Value.

    Bug: 1139221
@mkarolin
cr88 -> 1.19.x: NOTIFICATIONS_MUTED type has been added.
6702c4c 
Chromium changes:

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

commit c737f6c4bf029f8822f873a08986f17f20aca8ae
Author: Richard Knoll <knollr@chromium.org>
Date:   Mon Oct 26 11:45:44 2020 +0000

    Show "Notifications muted" notification

    Instead of silently muting notifications we want to let users know that
    there are new notifications without revealing their content. This will
    show a generic notification instead of the actual one and show a counter
    of how many notifications have been muted.

    Bug: 1131375

PERMISSION_REQUEST notification type was deprecated by

https://source.chromium.org/chromium/chromium/src/+/59b0b60663e44f5e4606bad09b634ce5cee95d60

commit 59b0b60663e44f5e4606bad09b634ce5cee95d60
Author: Andy Paicu <andypaicu@chromium.org>
Date:   Fri Jan 24 15:46:51 2020 +0000

    Cleanup all code related to displaying permission prompts as notifications

    Since we're not using any of the notification permission prompt flavors,
    this CL cleans up all the code that was introduced to experiment with
    them.

    Bug: 1029718
@mkarolin
cr88 -> 1.19.x: PermissionContextBase::NotifyPermissionSet sig. changed.
8d185a4 
Chromium change:

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

commit c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8
Author: Ravjit Singh Uppal <ravjit@chromium.org>
Date:   Fri Nov 13 01:38:52 2020 +0000

    Reland "Added support for one-time geolocation permission grants on desktop."

    This reverts commit 8f9cd957badbae895826cf15bbe33e1f1673b2dd.

    Reason for revert:

    Fixed compile failure after mid-air collision. Re-added include that
    this CL needs but was removed by https://crrev.com/c/2532577 in-between
    try jobs and landing.

    Original change's description:
    > Revert "Added support for one-time geolocation permission grants on desktop."
    >
    > This reverts commit 6e5cadb7b8162e8e8bd78f56a3d68c87fe5951b4.
    >
    > Reason for revert: compile failure
    > https://ci.chromium.org/p/chromium/builders/ci/chromeos-arm-generic-dbg/22520?
    >
    > Original change's description:
    > > Added support for one-time geolocation permission grants on desktop.
    > >
    > > Expanded the current permission request dialog to have the possibility
    > > to accept the permission for only one time.
    > >
    > > The permission will be invalidated when all the tabs with that origin
    > > are closed or navigated away from, or if a day has elapsed since the
    > > grant, whichever comes earlier.
    > >
    > > Bug: 1147918
@mkarolin
cr88 -> 1.19.x: Removes resource identifier use from tests.
bc6861e 
Chromium change:

https://chromium.googlesource.com/chromium/src.git/+/48f643c5e0d8e3e4e994a3504cdef3da6120f42f

commit 48f643c5e0d8e3e4e994a3504cdef3da6120f42f
Author: Illia Klimov <elklm@google.com>
Date:   Thu Nov 5 20:06:14 2020 +0000

    Remove resource identifier from HostContentSettingsMap.

    As part of the Flash/Plugins deprecation, the resource identifier
    becomes obsolete. This CL removes resource_identifier from the
    HostContentSettingsMap.

    This CL does not include Observer and Providers. They will be cleaned
    separately.

    Bug: 1134547
@mkarolin
cr88 -> 1.19.x: Lint fixes.
035e9a5
@mkarolin
cr88 -> 1.19.x: [iOS] Added a missing header include.
f40268f
@mkarolin
cr88 -> 1.19.x: Revert "[iOS] Fixes NS_SWIFT_NAME annotation."
2b43dae 
This reverts commit 1c94a1d.

The fix is not needed on 1.19.x branch.
@mkarolin
Copy link
Collaborator Author

Rebased on 1.19.x and removed a couple of iOS commits that somehow didn't cherry-pick properly initially.

@mkarolin
Copy link
Collaborator Author

CI:

  • Windows: browser test failures
 7 tests failed:
     RewardsBrowserTest.BackupRestoreModalHasNotice (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:304)
     RewardsBrowserTest.ResetRewardsWithBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:375)
     RewardsBrowserTest.UpholdLimitNoBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:398)
     RewardsContributionBrowserTest.TipConnectedPublisherVerified (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:586)
     RewardsContributionBrowserTest.TipUnverifiedPublisher (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:304)
     RewardsPromotionBrowserTest.ClaimViaSettingsPage (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:196)
     RewardsPromotionBrowserTest.PromotionRemovedFromEndpoint (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:231)

However, they all pass locally.

  • post-init: a known audit_deps failure (smallvec) - unrelated to the PR

@kjozwiak kjozwiak added this to the 1.19.x - Beta milestone Jan 13, 2021
kjozwiak
kjozwiak approved these changes Jan 13, 2021
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.19.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 877562a into 1.19.x Jan 13, 2021
@kjozwiak kjozwiak deleted the maxk-88.0.4315.7-1.19.x branch January 13, 2021 07:56
@mkarolin mkarolin mentioned this pull request Jan 20, 2021
Closed
mkarolin added a commit that referenced this pull request Jan 20, 2021
@mkarolin
Removes kVideoPlaybackQuality from disabled features.
302cbfc 
This fixes an incorrect merge introduced by #7518 that
reverted the fix initially implemented by #7451.

Fixes brave/brave-browser#13679
@mkarolin mkarolin mentioned this pull request Jan 20, 2021
Merged
23 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

@kjozwiak kjozwiak kjozwiak approved these changes

@emerick emerick emerick approved these changes

@simonhong simonhong simonhong approved these changes

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

@iefremov iefremov Awaiting requested review from iefremov iefremov is a code owner

@tmancey tmancey Awaiting requested review from tmancey tmancey is a code owner

@marshall marshall Awaiting requested review from marshall

Assignees

@mkarolin mkarolin

Labels
CI/run-network-audit Run network-audit
Projects
None yet
Milestone
1.19.x - Release
Development

Successfully merging this pull request may close these issues.
9 participants
@mkarolin @kylehickinson @kjozwiak @emerick @simonhong @AlexeyBarabash @mihaiplesa @bbondy @bsclifton