Remove arch from daily usage ping (#34277)

* Remove arch from daily usage ping

* Fix formatting

* Fix GN check and DEPS for brave_stats_updater_util include

Author: bbondy

browser/DEPS

@@ -135,6 +135,7 @@ specific_include_rules = {
   "brave_browser_process_impl\.cc": [
     "+brave/components/brave_component_updater/browser/brave_component_updater_delegate.h",
     "+brave/components/brave_component_updater/browser/local_data_files_service.h",
+    "+brave/components/brave_stats/browser/brave_stats_updater_util.h",
   ],
   "brave_browser_process_impl\.h": [
     "+brave/components/brave_component_updater/browser/brave_component.h",

browser/brave_browser_process_impl.cc

@@ -32,6 +32,7 @@
 #include "brave/components/brave_shields/content/browser/ad_block_service.h"
 #include "brave/components/brave_shields/content/browser/ad_block_subscription_service_manager.h"
 #include "brave/components/brave_shields/core/common/features.h"
+#include "brave/components/brave_stats/browser/brave_stats_updater_util.h"
 #include "brave/components/brave_sync/network_time_helper.h"
 #include "brave/components/brave_wallet/common/buildflags/buildflags.h"
 #include "brave/components/constants/pref_names.h"

browser/brave_stats/BUILD.gn

@@ -26,6 +26,8 @@ source_set("brave_stats") {
     "//brave/browser/brave_stats/switches.h",
   ]
 
+  public_deps = [ "//brave/components/brave_stats/browser" ]
+
   deps = [
     "//base",
     "//brave/browser:browser_process",
@@ -34,11 +36,9 @@ source_set("brave_stats") {
     "//brave/common",
     "//brave/components/brave_ads/buildflags",
     "//brave/components/brave_referrals/common",
-    "//brave/components/brave_stats/browser",
     "//brave/components/brave_wallet/common/buildflags",
     "//brave/components/constants",
     "//brave/components/misc_metrics",
-    "//brave/components/rpill/common",
     "//brave/components/serp_metrics",
     "//brave/components/version_info",
     "//chrome/browser:browser_process",

browser/brave_stats/DEPS

@@ -1,6 +1,5 @@
 include_rules = [
   "+brave/components/brave_referrals/common",
   "+brave/components/brave_stats/browser",
-  "+brave/components/rpill/common",
   "+brave/components/version_info",
 ]

browser/brave_stats/brave_stats_updater.cc

@@ -18,7 +18,6 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
-#include "base/system/sys_info.h"
 #include "brave/browser/brave_browser_features.h"
 #include "brave/browser/brave_stats/brave_stats_updater_params.h"
 #include "brave/browser/brave_stats/buildflags.h"
@@ -28,14 +27,12 @@
 #include "brave/browser/misc_metrics/profile_misc_metrics_service.h"
 #include "brave/browser/misc_metrics/profile_misc_metrics_service_factory.h"
 #include "brave/common/brave_channel_info.h"
-#include "brave/components/brave_ads/buildflags/buildflags.h"
 #include "brave/components/brave_referrals/common/pref_names.h"
 #include "brave/components/brave_stats/browser/brave_stats_updater_util.h"
 #include "brave/components/brave_wallet/common/buildflags/buildflags.h"
 #include "brave/components/constants/network_constants.h"
 #include "brave/components/constants/pref_names.h"
 #include "brave/components/misc_metrics/general_browser_usage.h"
-#include "brave/components/rpill/common/rpill.h"
 #include "brave/components/serp_metrics/serp_metrics.h"
 #include "brave/components/version_info/version_info.h"
 #include "chrome/browser/browser_process.h"
@@ -56,10 +53,6 @@
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "services/network/public/mojom/fetch_api.mojom-shared.h"
 
-#if BUILDFLAG(ENABLE_BRAVE_ADS)
-#include "brave/components/brave_ads/core/public/prefs/pref_names.h"
-#endif
-
 #if BUILDFLAG(ENABLE_BRAVE_WALLET)
 #include "brave/components/brave_wallet/browser/pref_names.h"
 #endif
@@ -288,22 +281,13 @@ bool BraveStatsUpdater::IsReferralInitialized() {
          pref_service_->GetBoolean(kReferralCheckedForPromoCodeFile);
 }
 
-bool BraveStatsUpdater::IsAdsEnabled() {
-#if BUILDFLAG(ENABLE_BRAVE_ADS)
-  return pref_service_->GetBoolean(brave_ads::prefs::kEnabledForLastProfile);
-#else
-  return false;
-#endif
-}
-
 void BraveStatsUpdater::OnProfileAdded(Profile* profile) {
   general_browser_usage_p3a_->ReportProfileCount(
       g_browser_process->profile_manager()->GetNumberOfProfiles());
 }
 
 void BraveStatsUpdater::QueueServerPing() {
   const bool referrals_initialized = IsReferralInitialized();
-  const bool ads_enabled = IsAdsEnabled();
   int num_closures = 0;
 
   // Note: We don't have the callbacks here because otherwise there is a race
@@ -312,9 +296,6 @@ void BraveStatsUpdater::QueueServerPing() {
   if (!referrals_initialized) {
     ++num_closures;
   }
-  if (ads_enabled) {
-    ++num_closures;
-  }
 
   // Note: If num_closures == 0, the callback runs immediately
   stats_preconditions_barrier_ = base::BarrierClosure(
@@ -329,16 +310,6 @@ void BraveStatsUpdater::QueueServerPing() {
         base::BindRepeating(&BraveStatsUpdater::OnReferralInitialization,
                             base::Unretained(this)));
   }
-
-  if (ads_enabled) {
-    DetectUncertainFuture();
-  }
-}
-
-void BraveStatsUpdater::DetectUncertainFuture() {
-  brave_rpill::DetectUncertainFuture(
-      base::BindOnce(&BraveStatsUpdater::OnDetectUncertainFuture,
-                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BraveStatsUpdater::OnReferralInitialization() {
@@ -348,18 +319,6 @@ void BraveStatsUpdater::OnReferralInitialization() {
   }
 }
 
-void BraveStatsUpdater::OnDetectUncertainFuture(
-    const bool is_uncertain_future) {
-  if (is_uncertain_future) {
-    arch_ = ProcessArch::kArchVirt;
-  } else {
-    arch_ = ProcessArch::kArchMetal;
-  }
-  if (stats_preconditions_barrier_) {
-    stats_preconditions_barrier_.Run();
-  }
-}
-
 void BraveStatsUpdater::StartServerPingStartupTimer() {
   stats_preconditions_barrier_.Reset();
   stats_startup_complete_ = true;
@@ -375,7 +334,7 @@ void BraveStatsUpdater::SendServerPing() {
 
   auto stats_updater_params =
       std::make_unique<brave_stats::BraveStatsUpdaterParams>(
-          pref_service_, GetSerpMetrics(profile_manager_), arch_);
+          pref_service_, GetSerpMetrics(profile_manager_));
   auto endpoint = BuildStatsEndpoint(kBraveUsageStandardPath);
   resource_request->url = GetUpdateURL(endpoint, *stats_updater_params);
   resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;

browser/brave_stats/brave_stats_updater.h

@@ -14,7 +14,6 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observation.h"
-#include "brave/components/brave_stats/browser/brave_stats_updater_util.h"
 #include "chrome/browser/profiles/profile_manager_observer.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "url/gurl.h"
@@ -84,15 +83,10 @@ class BraveStatsUpdater : public ProfileManagerObserver {
   // Invoked after browser has initialized with referral server.
   void OnReferralInitialization();
 
-  // Invoked after brave ads initializes
-  void OnDetectUncertainFuture(const bool is_uncertain_future);
-
-  void DetectUncertainFuture();
   void StartServerPingStartupTimer();
   void QueueServerPing();
   void SendServerPing();
 
-  bool IsAdsEnabled();
   bool IsReferralInitialized();
 
   // ProfileManagerObserver:
@@ -102,7 +96,6 @@ class BraveStatsUpdater : public ProfileManagerObserver {
 
   friend class ::BraveStatsUpdaterBrowserTest;
 
-  ProcessArch arch_ = ProcessArch::kArchSkip;
   bool stats_startup_complete_ = false;
   raw_ptr<PrefService> pref_service_ = nullptr;
   raw_ptr<ProfileManager> profile_manager_ = nullptr;

browser/brave_stats/brave_stats_updater_params.cc

@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/system/sys_info.h"
 #include "base/time/time.h"
 #include "brave/browser/brave_stats/features.h"
 #include "brave/browser/brave_stats/first_run_util.h"
@@ -46,25 +45,21 @@ bool IsHeadlessOrAutomationMode() {
 
 BraveStatsUpdaterParams::BraveStatsUpdaterParams(
     PrefService* stats_pref_service,
-    serp_metrics::SerpMetrics* serp_metrics,
-    const ProcessArch arch)
+    serp_metrics::SerpMetrics* serp_metrics)
     : BraveStatsUpdaterParams(stats_pref_service,
                               serp_metrics,
-                              arch,
                               GetCurrentDateAsYMD(),
                               GetCurrentISOWeekNumber(),
                               GetCurrentMonth()) {}
 
 BraveStatsUpdaterParams::BraveStatsUpdaterParams(
     PrefService* stats_pref_service,
     serp_metrics::SerpMetrics* serp_metrics,
-    const ProcessArch arch,
     const std::string& ymd,
     int woy,
     int month)
     : stats_pref_service_(stats_pref_service),
       serp_metrics_(serp_metrics),
-      arch_(arch),
       ymd_(ymd),
       woy_(woy),
       month_(month) {
@@ -115,16 +110,6 @@ std::string BraveStatsUpdaterParams::GetAdsEnabledParam() const {
 }
 #endif  // BUILDFLAG(ENABLE_BRAVE_ADS)
 
-std::string BraveStatsUpdaterParams::GetProcessArchParam() const {
-  if (arch_ == ProcessArch::kArchSkip) {
-    return "";
-  } else if (arch_ == ProcessArch::kArchMetal) {
-    return base::SysInfo::OperatingSystemArchitecture();
-  } else {
-    return "virt";
-  }
-}
-
 void BraveStatsUpdaterParams::LoadPrefs() {
   last_check_ymd_ = stats_pref_service_->GetString(kLastCheckYMD);
   last_check_woy_ = stats_pref_service_->GetInteger(kLastCheckWOY);
@@ -217,9 +202,6 @@ GURL BraveStatsUpdaterParams::GetUpdateURL(
   update_url =
       net::AppendQueryParameter(update_url, "adsEnabled", GetAdsEnabledParam());
 #endif  // BUILDFLAG(ENABLE_BRAVE_ADS)
-  update_url =
-      net::AppendQueryParameter(update_url, "arch", GetProcessArchParam());
-
   if (serp_metrics_ && ymd_ != last_check_ymd_) {
     // If `kSerpMetricsFeature` is disabled, `serp_metrics_` will be null and
     // SERP metrics will not be reported.

browser/brave_stats/brave_stats_updater_params.h

@@ -14,7 +14,6 @@
 #include "base/memory/raw_ptr.h"
 #include "base/time/time.h"
 #include "brave/components/brave_ads/buildflags/buildflags.h"
-#include "brave/components/brave_stats/browser/brave_stats_updater_util.h"
 
 class BraveStatsUpdaterTest;
 class GURL;
@@ -33,11 +32,9 @@ bool IsHeadlessOrAutomationMode();
 class BraveStatsUpdaterParams {
  public:
   explicit BraveStatsUpdaterParams(PrefService* stats_pref_service,
-                                   serp_metrics::SerpMetrics* serp_metrics,
-                                   const ProcessArch arch);
+                                   serp_metrics::SerpMetrics* serp_metrics);
   BraveStatsUpdaterParams(PrefService* stats_pref_service,
                           serp_metrics::SerpMetrics* serp_metrics,
-                          const ProcessArch arch,
                           const std::string& ymd,
                           int woy,
                           int month);
@@ -55,7 +52,6 @@ class BraveStatsUpdaterParams {
 #if BUILDFLAG(ENABLE_BRAVE_ADS)
   std::string GetAdsEnabledParam() const;
 #endif  // BUILDFLAG(ENABLE_BRAVE_ADS)
-  std::string GetProcessArchParam() const;
   GURL GetUpdateURL(const GURL& base_update_url,
                     std::string_view platform_id,
                     std::string_view channel_name,
@@ -68,7 +64,6 @@ class BraveStatsUpdaterParams {
 
   raw_ptr<PrefService> stats_pref_service_ = nullptr;
   const raw_ptr<serp_metrics::SerpMetrics> serp_metrics_;
-  ProcessArch arch_;
   std::string ymd_;
   int woy_;
   int month_;