Skip to content

Conversation

pilgrim-brave
Copy link
Contributor

fixes brave/brave-browser#2143

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

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

@pilgrim-brave pilgrim-brave requested a review from bbondy November 14, 2018 20:36
@pilgrim-brave pilgrim-brave self-assigned this Nov 14, 2018
@pilgrim-brave pilgrim-brave merged commit 0295402 into master Nov 15, 2018
@NejcZdovc NejcZdovc deleted the mpilgrim_fcm branch November 16, 2018 06:13
@bbondy bbondy added this to the 0.59.x - Beta milestone Jan 14, 2019
goodov added a commit that referenced this pull request Sep 19, 2022
Cleanup permission contexts on PermissionManager::Shutdown().
emerick added a commit that referenced this pull request Aug 21, 2025
…iderClient` in omnibox test

In order to avoid a nullptr error on Android/iOS, use
`FakeAutocompleteProviderClient` instead of `MockAutocompleteProviderClient` in
our `OmniboxPromotionTest` unit tests. The former provides actual stub
implementations of the AIM functionality now needed due to the specified
upstream change.

Since `FakeAutoCompleteProviderClient` specifies its own `TestingPrefService`,
we use that when registering our prefs.

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/0e52ba41415835f9fbd4bcb33e08330e37b03f1c

commit 0e52ba41415835f9fbd4bcb33e08330e37b03f1c
Author: Jian Li <[email protected]>
Date:   Tue Aug 19 11:03:00 2025 -0700

    [M140] Guard AIM features for typed state

    Original change's description:
    > Guard AIM features for typed state
    >
    > Bug: 436228908
    > Change-Id: Ica094d9a0c039e1e638275cdb20a3c39b80ca93c
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6827964
    > Commit-Queue: Jian Li <[email protected]>
    > Reviewed-by: Tomasz Wiszkowski <[email protected]>
    > Reviewed-by: Moe Ahmadi <[email protected]>
    > Cr-Commit-Position: refs/heads/main@{#1502190}

    Bug: 439651624,436228908
    Change-Id: Ica094d9a0c039e1e638275cdb20a3c39b80ca93c
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6863270
    Auto-Submit: Chrome Cherry Picker <chrome-cherry-picker@chops-service-accounts.iam.gserviceaccount.com>
    Bot-Commit: Rubber Stamper <[email protected]>
    Commit-Queue: Rubber Stamper <[email protected]>
    Cr-Commit-Position: refs/branch-heads/7339@{#908}
    Cr-Branched-From: 27be8b77710f4405fdfeb4ee946fcabb0f6c92b2-refs/heads/main@{#1496484}
ShivanKaul pushed a commit that referenced this pull request Aug 25, 2025
…iderClient` in omnibox test

In order to avoid a nullptr error on Android/iOS, use
`FakeAutocompleteProviderClient` instead of `MockAutocompleteProviderClient` in
our `OmniboxPromotionTest` unit tests. The former provides actual stub
implementations of the AIM functionality now needed due to the specified
upstream change.

Since `FakeAutoCompleteProviderClient` specifies its own `TestingPrefService`,
we use that when registering our prefs.

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/0e52ba41415835f9fbd4bcb33e08330e37b03f1c

commit 0e52ba41415835f9fbd4bcb33e08330e37b03f1c
Author: Jian Li <[email protected]>
Date:   Tue Aug 19 11:03:00 2025 -0700

    [M140] Guard AIM features for typed state

    Original change's description:
    > Guard AIM features for typed state
    >
    > Bug: 436228908
    > Change-Id: Ica094d9a0c039e1e638275cdb20a3c39b80ca93c
    > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6827964
    > Commit-Queue: Jian Li <[email protected]>
    > Reviewed-by: Tomasz Wiszkowski <[email protected]>
    > Reviewed-by: Moe Ahmadi <[email protected]>
    > Cr-Commit-Position: refs/heads/main@{#1502190}

    Bug: 439651624,436228908
    Change-Id: Ica094d9a0c039e1e638275cdb20a3c39b80ca93c
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6863270
    Auto-Submit: Chrome Cherry Picker <chrome-cherry-picker@chops-service-accounts.iam.gserviceaccount.com>
    Bot-Commit: Rubber Stamper <[email protected]>
    Commit-Queue: Rubber Stamper <[email protected]>
    Cr-Commit-Position: refs/branch-heads/7339@{#908}
    Cr-Branched-From: 27be8b77710f4405fdfeb4ee946fcabb0f6c92b2-refs/heads/main@{#1496484}
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.

Disable FCM (Firebase Cloud Messaging)

2 participants