[ads] Fixes earnings in rewards non-custodian state count towards earnings in rewards custodian state

[tmancey]

Resolves brave/brave-browser#41425

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 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:

• The associated issue milestone is set to the smallest version that the
  changes has landed on
• All relevant documentation has been updated, for instance:
  • https://github.com/brave/brave-browser/wiki/Deviations-from-Chromium-(features-we-disable-or-remove)
  • https://github.com/brave/brave-browser/wiki/Proxy-redirected-URLs
  • https://github.com/brave/brave-browser/wiki/Fingerprinting-Protections
  • https://github.com/brave/brave-browser/wiki/Brave%E2%80%99s-Use-of-Referral-Codes
  • https://github.com/brave/brave-browser/wiki/Web-Compatibility-Exceptions-in-Brave
  • https://github.com/brave/brave-browser/wiki/QA-Guide
  • https://github.com/brave/brave-browser/wiki/P3A

Test Plan:

[github-actions]

[puLL-Merge] - brave/brave-core@26235

Description

This pull request modifies the behavior of the Brave Ads system, particularly in relation to user rewards and wallet migration. The changes remove the functionality for migrating verified rewards users and simplify the process of clearing and restarting the ads service.

Changes

Changes

1. components/brave_ads/browser/ads_service_impl.cc and .h:

   • Renamed ShutdownAndClearData to ShutdownClearDataAndMaybeRestart.
   • Removed setting of kShouldMigrateVerifiedRewardsUser preference.
   • Modified OnExternalWalletConnected to call ShutdownClearDataAndMaybeRestart instead of setting a preference.

2. components/brave_ads/core/internal/account/account.cc and .h:

   • Removed OnDidMigrateVerifiedRewardsUser method and related functionality.

3. components/brave_ads/core/internal/account/confirmations/confirmations_util.cc and .h:

   • Removed ResetTokens function.

4. components/brave_ads/core/internal/account/issuers/issuers_util.cc and .h:

   • Removed ResetIssuers function.

5. components/brave_ads/core/internal/account/user_rewards/user_rewards.cc and .h:

   • Removed MaybeMigrateVerifiedRewardsUser and related functionality.
   • Removed UserRewardsDelegate and its usage.

6. Deleted user_rewards_delegate.h, user_rewards_delegate_mock.cc, and user_rewards_delegate_mock.h.

7. components/brave_ads/core/internal/account/user_rewards/user_rewards_util.cc and .h:

   • Removed ShouldMigrateVerifiedRewardsUser function.

8. components/brave_ads/core/internal/prefs/obsolete_pref_util.cc:

   • Added kShouldMigrateVerifiedRewardsUser to obsolete preferences.

9. components/brave_ads/core/internal/prefs/pref_registry.cc:

   • Removed registration of kShouldMigrateVerifiedRewardsUser preference.

10. components/brave_ads/core/public/prefs/pref_names.h:

    • Removed kShouldMigrateVerifiedRewardsUser constant.

11. components/brave_rewards/browser/test/rewards_state_browsertest.cc:

    • Removed assertions related to kShouldMigrateVerifiedRewardsUser preference.

Possible Issues

The removal of the verified rewards user migration functionality might affect users who haven't yet migrated. It's important to ensure that this change doesn't negatively impact existing users or cause any data loss.

Security Hotspots

There are no apparent security hotspots in this change. The modifications primarily involve removing functionality rather than adding new code that could introduce vulnerabilities.

[brave-builds]

Released in v1.73.51