Fix state-level ad targeting shown for non-US region

[emerick]

Resolves brave/brave-browser#19589

Submitter Checklist:

• I confirm that no security/privacy review is needed, or that I have requested one
• There is a ticket for my issue
• Used Github auto-closing keywords in the PR description above
• 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)

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/Custom-Headers
  • 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:

Follow STR in brave/brave-browser#19589

[tmancey]

LGTM

[zenparsing]

It looks like the motivation for moving this JSON-construction code into the service layer is to avoid sharing it between the rewards page and the rewards extension API, and that the Ads service does JSON-construction already in GetInlineContentAd.

It seems to me that the service layer shouldn't be concerned with how the front-end might need data packaged up, but we currently don't have a good alternative for where to put this code. Options are:

1. Leave the code duplicated for now, since we expect to deprecate the rewards page in the future.
2. Move this code to the rewards extension API and have the rewards page use that (I'm pretty sure that chrome.braveRewards is already used there.
3. Introduce some new class (service?) for JSON-ifying data for rewards UIs.

My personal preference would be for 1 or 2. I'd probably shy away from adding the code to the Ads service since the Ads service shouldn't need to know how the data is used on the settings page or rewards page.

[emerick]

Makes total sense, I'll just copy the function for now.

[GeetaSarvadnya]

Verification passed on

Brave | 1.34.40 Chromium: 96.0.4664.45 (Official Build) nightly (64-bit)
-- | --
Revision | 76e4c1bb2ab4671b8beba3444e61c0f17584b2fc-refs/branch-heads/4664@{#947}
OS | Windows 10 Version 21H2 (Build 19044.1387)

Confirmed state-level ad targeting dropdown isn't shown for the non-US region India

brave://settings/rewards	brave://rewards/

Confirmed state-level ad targeting dropdown is shown only for US region

brave://settings/rewards	brave://rewards/

[goodov]

@emerick I got a DCHECK when I open Settings page:

[98904:10884:1129/174909.495:FATAL:api_response_validator.cc(78)] Check failed: false. Error validating response to `braveRewards.getAdsData`: Error at parameter 'adsIsSupported': Invalid type: expected boolean, found object.

Seems like brave_rewards.json should be like this:

      {
        "name": "getAdsData",
        "type": "function",
        "description": "Gets whether ads is supported in the user's region",
        "parameters": [
          {
            "type": "function",
            "name": "callback",
            "parameters": [
              {
                "name": "adsData",
                "type": "object",
                "properties": {
                  "adsIsSupported": {
                    "type": "boolean"
                  },
                  "adsEnabled": {
                    "type": "boolean"
                  },
                  "adsPerHour": {
                    "type": "number"
                  },
                  "adsSubdivisionTargeting": {
                    "type": "string"
                  },
                  "automaticallyDetectedAdsSubdivisionTargeting": {
                    "type": "string"
                  },
                  "shouldAllowAdsSubdivisionTargeting": {
                    "type": "boolean"
                  },
                  "adsUIEnabled": {
                    "type": "boolean"
                  }
                }
              }
            ]
          }
        ]
      },

[emerick]

Thanks for catching and reporting this @goodov! I entered brave/brave-browser#19802 to track this.