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 88.0.4315.7 to Chromium 88.0.4324.51. #7408

Merged
merged 66 commits into from
Jan 7, 2021
Merged

Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51. #7408

merged 66 commits into from
Jan 7, 2021

Conversation

mkarolin
Copy link
Collaborator

Fixes brave/brave-browser#13103
Related PR: brave/brave-browser#13143

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 Dec 10, 2020
@mkarolin mkarolin mentioned this pull request Dec 10, 2020
Merged
23 tasks
@mkarolin mkarolin changed the title Upgrade from Chromium 88.0.4315.5 to Chromium 88.0.4324.41. WIP: Upgrade from Chromium 88.0.4315.5 to Chromium 88.0.4324.41. Dec 17, 2020
@mkarolin mkarolin marked this pull request as ready for review December 17, 2020 16:20
tmancey
tmancey reviewed Dec 17, 2020
View reviewed changes
ui/brave_ads/ad_notification_view_md.cc
@@ -403,9 +403,6 @@ void AdNotificationViewMD::UpdateControlButtonsVisibilityWithNotification(
UpdateControlButtonsVisibility();
}

void AdNotificationViewMD::ButtonPressed(views::Button* sender,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Were changes in ui/brave_ads intentional as these will likely break ads?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, these are due to the Chromium change: https://chromium.googlesource.com/chromium/src/+/37cb433bb3d86231ee0c37cdd8a08f31ab35f172 (views::ButtonListener has been removed).

samartnik
samartnik approved these changes Dec 17, 2020
View reviewed changes
Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

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

++

@mkarolin mkarolin changed the title WIP: Upgrade from Chromium 88.0.4315.5 to Chromium 88.0.4324.41. WIP: Upgrade from Chromium 88.0.4315.5 to Chromium 88.0.4324.51. Dec 17, 2020
bridiver and others added 7 commits January 5, 2021 21:27
@bridiver @mkarolin
subclass to remove patch for default provider
585f653
@bridiver @mkarolin
remove more patches
0dcdcb1
@bridiver @mkarolin
fix gn checks
6b802fd
@mkarolin
Lint fixes.
7ba3c3f
@mkarolin
Formatting fixes.
f6f6d30
@mkarolin
Reverted formatting of BATBraveRewards.h.
7552e7d
@mkarolin
[iOS] Modified rpath for brave_rewards_ios_tests.
e7f1c8b 
Added:
- /usr/lib/swift
- @executable_path/../Frameworks

This to get around the error:

brave_rewards_ios_tests.app (22597) encountered an error (Early unexpected exit, operation never finished bootstrapping - no restart will be attempted. (Underlying Error: Crash: brave_rewards_ios_tests (22597):   dyld: Using shared cache: 59E5DB8B-B935-310F-81BF-FB7488068748
Library not loaded: @rpath/libswiftCore.dylib
@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 6, 2021
@mkarolin
[iOS] Disable WidgetKit extension.
8207ee2 
Chromium change:

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

commit f8ddb215c89b090a11494830f28b6b630167a7a8
Author: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Date:   Mon Nov 9 22:09:33 2020 +0000

    [iOS][WidgetKit] Enable extension by default in ToT

    Bug: 1138702
@mkarolin
IsShieldsContentSettingsType is not used on iOS.
7c795ca
@mkarolin
Reverted some ugly formatting.
b57ddbb
@mkarolin
Bumped up histogram values for our ContentSettingsTypes.
8519666 
Added a gap between Chromium and our histogram values for
ContentSettingsType enum values. This is needed so that we don't have
collisions when new values are added to the enum and the array upstream.
@mkarolin
Prevent startup crash on iOS due to unregistered metrics prefs.
4bd1bb4
@mkarolin
Prevent crash on iOS when modifying AUTOPLAY pref.
ee1aebd 
This prevents crash on iOS when AUTOPLAY isn't registered (unclear why
ATM).

Also, removes unneeded header include.
@mkarolin
Copy link
Collaborator Author

mkarolin commented Jan 7, 2021

CI:

  • Linux: a known network-audit error
  • Formatting: 1 formatting error in a file that shouldn't be formatted (vendor/brave-ios/BATBraveRewards.h)

Merging.

@mkarolin mkarolin merged commit 8c4a6c9 into master Jan 7, 2021
@mkarolin mkarolin deleted the cr88 branch January 7, 2021 01:22
@mkarolin mkarolin added this to the 1.20.x - Nightly milestone Jan 7, 2021
iefremov
iefremov reviewed Jan 7, 2021
View reviewed changes
chromium_src/components/content_settings/core/common/content_settings.cc

int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,
size_t* num_values) {
DCHECK(static_cast<int>(ContentSettingsType::NUM_TYPES) < kBraveValuesStart);
Copy link
Contributor

Choose a reason for hiding this comment

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

jfyi this could be static_assert

mkarolin added a commit that referenced this pull request Jan 8, 2021
@mkarolin
Merge pull request #7408 from brave/cr88
cfbaa48 
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
@mkarolin mkarolin mentioned this pull request Jan 11, 2021
Merged
23 tasks
mkarolin added a commit that referenced this pull request Jan 12, 2021
@mkarolin
Merge pull request #7408 from brave/cr88
9d9d662 
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
mkarolin added a commit that referenced this pull request Jan 12, 2021
@mkarolin
Merge pull request #7408 from brave/cr88
0cf8f35 
Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iefremov iefremov iefremov approved these changes

@bridiver bridiver bridiver approved these changes

@kylehickinson kylehickinson kylehickinson approved these changes

@tmancey tmancey tmancey approved these changes

@simonhong simonhong simonhong approved these changes

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

@samartnik samartnik samartnik approved these changes

@marshall marshall Awaiting requested review from marshall

@zenparsing zenparsing Awaiting requested review from zenparsing

Assignees

@mariospr mariospr

@samartnik samartnik

@mkarolin mkarolin

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

Successfully merging this pull request may close these issues.

Upgrade from Chromium 88.0.4315.7 to Chromium 88.0.4324.51.
9 participants
@mkarolin @bridiver @kylehickinson @tmancey @iefremov @simonhong @AlexeyBarabash @samartnik @mariospr