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 90 to Chromium 91 (1.25.x) #8840

Merged
merged 13 commits into from
May 19, 2021
Merged

Upgrade from Chromium 90 to Chromium 91 (1.25.x) #8840

merged 13 commits into from
May 19, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented May 18, 2021 •
edited
Loading

Fixes brave/brave-browser#14848
Related PR: brave/brave-browser#15933
Uplift from #8307

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:

mkarolin and others added 11 commits May 18, 2021 01:20
@mkarolin
Merge pull request #8307 from brave/cr91
a122d1e 
Upgrade from Chromium 90 to Chromium 91.
@bsclifton @mkarolin
Merge pull request #8729 from brave/91.0.4472.38
1e8c09b 
Upgrade from Chromium 91.0.4472.19 to Chromium 91.0.4472.38.
@simonhong @mkarolin
Merge pull request #8741 from brave/fixed_tab_search_button
1b4750f 
Fixed TabSearchButton's weird hover/pressed effect
@mkarolin
[MacOS] Override helper-alerts entitlements for signing. (#8755)
f5f9b45 
* [MacOS] Override helper-alerts identifier for signing.

Alerts helper has been added for signing upstream but Chrome doesn't
distribute it yet. Because it uses the same identifier as the current
alerts service, we get a signing error.

For now we'll use a different identifier for this helper and then
revert once Chrome starts distributing the helper.

Fixes brave/brave-browser#15731

Chromium change:

https://chromium.googlesource.com/chromium/src.git/+/56915522276f

commit 56915522276f86acc55f86b143b4d7b260d6bc36
Author: Richard Knoll <knollr@chromium.org>
Date:   Fri Mar 5 16:07:34 2021 +0000

    Introduce alert notification helper .app

    This adds a new helper .app on macOS to display alert notifications.
    This app is required to show alert style notifications as the main app
    can only show banner style ones and the XPC service can not use the new
    UNNotification APIs.

    Bug: 1127306

* Pacify pylint for signing_helper.py
@bsclifton @mkarolin
Merge pull request #8793 from brave/91.0.4472.57_master_97
83b1516 
Upgrade patches from Chromium 91.0.4472.38 to Chromium 91.0.4472.57
@mkarolin
Merge pull request #8800 from brave/maxk-fix-settings-ui-privacy-page
33d82b0 
Fixes Settings UI privacy page missing settings.
@samartnik @mkarolin
Merge pull request #8702 from brave/android_settings_close_button
cdb0077 
[Android] Changed the way we handle close button in settings
@mkarolin
Replace all usage of base::string16 with std::u16string II.
e80a480 
Follow up to 79af4bc.

Picks up base::string16 leftovers specific to 1.25.x branch.
@mkarolin
Padded button ink drop color was removed II.
e96c231 
Follow up to d09bca5 for 1.25.x
specific code.
@mkarolin
Fixes IPFS Settings page.
4e0d5ae
@mkarolin
Merge pull request #8039 from brave/maxk-disable-trust-tokens
963ce2b 
Disables TrustTokens feature.
@mkarolin mkarolin added the CI/run-network-audit Run network-audit label May 18, 2021
@mkarolin mkarolin requested a review from a team May 18, 2021 13:08
@mkarolin mkarolin self-assigned this May 18, 2021
@mkarolin mkarolin requested review from emerick and removed request for a team May 18, 2021 13:08
@mkarolin mkarolin mentioned this pull request May 18, 2021
Merged
24 tasks
@mkarolin mkarolin added the CI/skip-android Do not run CI builds for Android label May 18, 2021
@mkarolin mkarolin added CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels May 18, 2021
@mkarolin
Copy link
Collaborator Author

CI failures:

  • Linux: 2 BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath browser tests crashed. These are known and unrelated to this PR.
  • MacOS: build error. Will push the fix and restart on MacOS only once Window CI finishes.

tmancey
tmancey approved these changes May 18, 2021
View reviewed changes
Copy link
Collaborator

@tmancey tmancey left a comment

Choose a reason for hiding this comment

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

LGTM++

@kjozwiak
Copy link
Member

Restarting macOS as it timed out after reaching the 6hr limit as per https://ci.brave.com/job/pr-brave-browser-cr91-1.25.x-macos/4/console.

20:10:20  [40036/50977] CXX obj/third_party/blink/renderer/core/core/ng_inline_items_builder.o
Calling Pipeline was cancelled
20:10:22  Sending interrupt signal to process

@kjozwiak
Copy link
Member

Restarting macOS as the pipeline timed out again after reaching the 6hr limit as per https://ci.brave.com/job/pr-brave-browser-cr91-1.25.x-macos/5/console.

02:13:45  [2786/2787] STAMP obj/brave/components/brave_ads/test/brave_ads_unit_tests.stamp
Calling Pipeline was cancelled
02:19:18  Sending interrupt signal to process
02:19:18  Sending interrupt signal to process

AlexeyBarabash
AlexeyBarabash approved these changes May 19, 2021
View reviewed changes
Copy link
Contributor

@AlexeyBarabash AlexeyBarabash left a comment

Choose a reason for hiding this comment

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

++ for sync changes

@kjozwiak
Copy link
Member

test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-cr91-1.25.x-macos/8/testReport/. However, this is a known intermittent issue and unrelated to this specific PR.

macos-x64 / test-browser / BraveAdsBrowserTest/BraveAdsUpgradeBrowserTest.UpgradePath/PreferencesForVersion070WithRewardsAndAdsEnabled_ForUnsupportedLocale_ForUnsupportedLocale_RewardsShouldBeEnabled_AdsShouldBeDisabled

kjozwiak
kjozwiak approved these changes May 19, 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.25.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 155f33b into 1.25.x May 19, 2021
@kjozwiak kjozwiak deleted the cr91-1.25.x branch May 19, 2021 19:30
@kjozwiak kjozwiak added this to the 1.25.x - Beta milestone May 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmancey tmancey tmancey approved these changes

@kjozwiak kjozwiak kjozwiak approved these changes

@goodov goodov goodov approved these changes

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

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

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

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

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

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

@emerick emerick Awaiting requested review from emerick

Assignees

@mkarolin mkarolin

Labels
CI/run-network-audit Run network-audit CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Milestone
1.25.x - Release
Development

Successfully merging this pull request may close these issues.
8 participants
@mkarolin @kjozwiak @tmancey @goodov @AlexeyBarabash @bsclifton @simonhong @samartnik