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

Fixes crash in brave://settings/content/all. #5777

Merged
merged 1 commit into from
Jun 9, 2020
Merged

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Jun 9, 2020

Fixes brave/brave-browser#10160

Updated code to use a patch instead of the override for a function
because the function is now called from the same file where it is
defined.

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@mkarolin mkarolin added this to the 1.12.x - Nightly milestone Jun 9, 2020
@mkarolin mkarolin requested a review from darkdh June 9, 2020 00:47
@mkarolin mkarolin requested a review from bridiver as a code owner June 9, 2020 00:47
@mkarolin mkarolin self-assigned this Jun 9, 2020
@mkarolin
Copy link
Collaborator Author

mkarolin commented Jun 9, 2020

CI: only install test on Mac failed (known unrelated issue).

Fixes brave/brave-browser#10160

Updated code to use a patch instead of the override for a function
because the function is now called from the same file where it is
defined.
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Works great 👍

@mkarolin mkarolin merged commit 06ef27e into master Jun 9, 2020
@mkarolin mkarolin deleted the maxk-issue-10160 branch June 9, 2020 21:53
mkarolin added a commit that referenced this pull request Jun 9, 2020
Fixes crash in brave://settings/content/all.
mkarolin added a commit that referenced this pull request Jun 9, 2020
Fixes crash in brave://settings/content/all.
@btlechowski
Copy link

LGTM

Brave 1.12.14 Chromium: 83.0.4103.97 (Official Build) nightly (64-bit)
Revision 326d148b9655369b86498d9ecca39f63dd2bdd2d-refs/branch-heads/4103@{#657}
OS Linux
Brave 1.12.14 Chromium: 83.0.4103.97 (Official Build) nightly (64-bit)
Revision 326d148b9655369b86498d9ecca39f63dd2bdd2d-refs/branch-heads/4103@{#657}
OS Windows 7 Service Pack 1 (Build 7601.24544)

No more crash. Verified test plan from brave/brave-browser#10160
Also verified test plan from brave/brave-browser#10049 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Desktop] Browser Crash when loading brave://settings/content/all
5 participants