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 119.0.6045.134 to Chromium 119.0.6045.163 (1.60.x) #20983

Merged
merged 4 commits into from
Nov 15, 2023
Merged

Upgrade from Chromium 119.0.6045.134 to Chromium 119.0.6045.163 (1.60.x) #20983

merged 4 commits into from
Nov 15, 2023

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Nov 14, 2023

Resolves brave/brave-browser#34331

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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 wiki
    • npm run lint, npm run presubmit wiki, 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:

@emerick emerick added this to the 1.60.x - Release #4 milestone Nov 14, 2023
@emerick emerick self-assigned this Nov 14, 2023
@emerick emerick requested a review from a team as a code owner November 14, 2023 22:56
@github-actions github-actions bot added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) labels Nov 14, 2023
@emerick emerick changed the title 1Upgrade from Chromium 119.0.6045.134 to Chromium 119.0.6045.163 (1.60.x) Upgrade from Chromium 119.0.6045.134 to Chromium 119.0.6045.163 (1.60.x) Nov 14, 2023
@emerick
Update TestExtensionSearchEngine utility function with upstream changes
54b3ef0 
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/50054d2565a0b299c8d2636d096e800352a2a027

commit 50054d2565a0b299c8d2636d096e800352a2a027
Author: Nicolas Dossou-Gbete <dgn@chromium.org>
Date:   Thu Nov 9 00:50:50 2023 +0000

    Allow extensions to load prepopulated engines from the full set

    GetPrepopulatedEngine() was looking for the provided prepopulated ID
    in a smaller set, made of the top 5 (in general) engines in the profile's country. For extensions aiming to match an engine outside
    of the set, the lookup would fail and they would not be able to set
    additional data like the NTP URL.

    This CL fixes it by adding a new function looking up engines in the
    full set of known search engines, and using that variant specifically
    for the extensions use case.

    Bug: 1500526
kjozwiak
kjozwiak approved these changes Nov 15, 2023
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.60.x approved 👍

@kjozwiak kjozwiak merged commit d6d5870 into 1.60.x Nov 15, 2023
14 checks passed
@kjozwiak kjozwiak deleted the 119.0.6045.163_1.60.x branch November 15, 2023 07:20
@kjozwiak kjozwiak mentioned this pull request Nov 15, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@emerick emerick

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit
Projects
None yet
Milestone
1.60.x - Release #4
Development

Successfully merging this pull request may close these issues.
3 participants
@emerick @kjozwiak @brave-builds