Issue 6841: Fix the ads state P3A metric.

We were recording a wrong value ("No wallet") even if the user already
had had a wallet in place. Now we try to properly record it and do it
only once with the help of an additional flag.

Author: Ivan Efremov

components/brave_ads/browser/ads_service_factory.cc

@@ -84,7 +84,8 @@ void AdsServiceFactory::RegisterProfilePrefs(
   registry->RegisterUint64Pref(prefs::kAdsPerDay, 20);
 
   registry->RegisterIntegerPref(prefs::kIdleThreshold, 15);
-  registry->RegisterBooleanPref(prefs::kBraveAdsWereDisabled, false);
+  registry->RegisterBooleanPref(prefs::kAdsWereDisabled, false);
+  registry->RegisterBooleanPref(prefs::kHasAdsP3AState, false);
 
   registry->RegisterBooleanPref(prefs::kShouldShowMyFirstAdNotification, true);
 

components/brave_ads/common/pref_names.cc

@@ -13,7 +13,11 @@ namespace prefs {
 const char kEnabled[] = "brave.brave_ads.enabled";
 
 // Stores whether ads were disabled at least once
-const char kBraveAdsWereDisabled[] = "brave.brave_ads.were_disabled";
+const char kAdsWereDisabled[] = "brave.brave_ads.were_disabled";
+
+// Indicates whether we have any initial state of the ads status metric, besides
+// "No Wallet".
+const char kHasAdsP3AState[] = "brave.brave_ads.has_p3a_state";
 
 // Stores the maximum amount of ads per hour
 const char kAdsPerHour[] = "brave.brave_ads.ads_per_hour";

components/brave_ads/common/pref_names.h

@@ -14,7 +14,8 @@ extern const char kEnabled[];
 
 extern const char kAdsPerHour[];
 extern const char kAdsPerDay[];
-extern const char kBraveAdsWereDisabled[];
+extern const char kAdsWereDisabled[];
+extern const char kHasAdsP3AState[];
 
 extern const char kIdleThreshold[];
 

components/brave_rewards/browser/rewards_p3a.cc

@@ -88,17 +88,17 @@ void UpdateAdsP3AOnPreferenceChange(PrefService *prefs,
   if (pref == brave_ads::prefs::kEnabled) {
     if (prefs->GetBoolean(brave_ads::prefs::kEnabled)) {
       brave_rewards::RecordAdsState(AdsP3AState::kAdsEnabled);
-      prefs->SetBoolean(brave_ads::prefs::kBraveAdsWereDisabled, false);
+      prefs->SetBoolean(brave_ads::prefs::kAdsWereDisabled, false);
     } else {
       // Apparently, the pref was disabled.
       brave_rewards::RecordAdsState(
           rewards_enabled ? AdsP3AState::kAdsEnabledThenDisabledRewardsOn :
                             AdsP3AState::kAdsEnabledThenDisabledRewardsOff);
-      prefs->SetBoolean(brave_ads::prefs::kBraveAdsWereDisabled, true);
+      prefs->SetBoolean(brave_ads::prefs::kAdsWereDisabled, true);
     }
   } else if (pref == brave_rewards::prefs::kBraveRewardsEnabled) {
     // Rewards pref was changed
-    if (prefs->GetBoolean(brave_ads::prefs::kBraveAdsWereDisabled)) {
+    if (prefs->GetBoolean(brave_ads::prefs::kAdsWereDisabled)) {
       brave_rewards::RecordAdsState(
           rewards_enabled ? AdsP3AState::kAdsEnabledThenDisabledRewardsOn :
                             AdsP3AState::kAdsEnabledThenDisabledRewardsOff);
@@ -107,6 +107,15 @@ void UpdateAdsP3AOnPreferenceChange(PrefService *prefs,
   }
 }
 
+void MaybeRecordInitialAdsP3AState(PrefService* prefs) {
+  if (not prefs->GetBoolean(brave_ads::prefs::kHasAdsP3AState)) {
+    const bool ads_state = prefs->GetBoolean(brave_ads::prefs::kEnabled);
+    RecordAdsState(ads_state ? AdsP3AState::kAdsEnabled
+                             : AdsP3AState::kAdsDisabled);
+    prefs->SetBoolean(brave_ads::prefs::kHasAdsP3AState, true);
+  }
+}
+
 void RecordNoWalletCreatedForAllMetrics() {
   RecordWalletBalanceP3A(false, 0);
   RecordAutoContributionsState(AutoContributionsP3AState::kNoWallet, 0);

components/brave_rewards/browser/rewards_p3a.h

@@ -50,6 +50,10 @@ void RecordAdsState(AdsP3AState state);
 void UpdateAdsP3AOnPreferenceChange(PrefService* prefs,
                                     const std::string& pref);
 
+// Records an initial metric state ("disabled" or "enabled") if it was not done
+// before. Intended to be called if the user has already created a wallet.
+void MaybeRecordInitialAdsP3AState(PrefService* local_state);
+
 void RecordNoWalletCreatedForAllMetrics();
 
 double CalcWalletBalanceForP3A(base::flat_map<std::string, double> wallets,

components/brave_rewards/browser/rewards_service_impl.cc

@@ -927,7 +927,7 @@ void RewardsServiceImpl::OnWalletInitialized(ledger::Result result) {
     RecordWalletBalanceP3A(true, 0);
 #if BUILDFLAG(BRAVE_ADS_ENABLED)
     const bool ads_enabled =
-      profile_->GetPrefs()->GetBoolean(brave_ads::prefs::kEnabled);
+        profile_->GetPrefs()->GetBoolean(brave_ads::prefs::kEnabled);
     RecordAdsState(ads_enabled ? AdsP3AState::kAdsEnabled
                                : AdsP3AState::kAdsDisabled);
 #endif
@@ -1070,6 +1070,7 @@ void RewardsServiceImpl::OnLedgerStateLoaded(
     }
     // Record stats.
     RecordBackendP3AStats();
+    MaybeRecordInitialAdsP3AState(profile_->GetPrefs());
   }
   if (state.first.empty()) {
     RecordNoWalletCreatedForAllMetrics();