diff --git a/browser/DEPS b/browser/DEPS index b3270236269..459bcdd1714 100644 --- a/browser/DEPS +++ b/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", diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc index 73f0fe26f86..e18e4541ab3 100644 --- a/browser/brave_browser_process_impl.cc +++ b/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" diff --git a/browser/brave_stats/BUILD.gn b/browser/brave_stats/BUILD.gn index 7f89872d20d..54aeb8a1044 100644 --- a/browser/brave_stats/BUILD.gn +++ b/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", diff --git a/browser/brave_stats/DEPS b/browser/brave_stats/DEPS index e8060170e96..fe33b03c4c6 100644 --- a/browser/brave_stats/DEPS +++ b/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", ] diff --git a/browser/brave_stats/brave_stats_updater.cc b/browser/brave_stats/brave_stats_updater.cc index 25bebfc233d..3cb745eaa65 100644 --- a/browser/brave_stats/brave_stats_updater.cc +++ b/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,14 +281,6 @@ 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()); @@ -303,7 +288,6 @@ void BraveStatsUpdater::OnProfileAdded(Profile* profile) { 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( - 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; diff --git a/browser/brave_stats/brave_stats_updater.h b/browser/brave_stats/brave_stats_updater.h index 0afe90dcc40..97b30e0cb3e 100644 --- a/browser/brave_stats/brave_stats_updater.h +++ b/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 pref_service_ = nullptr; raw_ptr profile_manager_ = nullptr; diff --git a/browser/brave_stats/brave_stats_updater_params.cc b/browser/brave_stats/brave_stats_updater_params.cc index 013026217c7..39ef6849e27 100644 --- a/browser/brave_stats/brave_stats_updater_params.cc +++ b/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,11 +45,9 @@ 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()) {} @@ -58,13 +55,11 @@ BraveStatsUpdaterParams::BraveStatsUpdaterParams( 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. diff --git a/browser/brave_stats/brave_stats_updater_params.h b/browser/brave_stats/brave_stats_updater_params.h index a7378b48970..f14d2e93b91 100644 --- a/browser/brave_stats/brave_stats_updater_params.h +++ b/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 stats_pref_service_ = nullptr; const raw_ptr serp_metrics_; - ProcessArch arch_; std::string ymd_; int woy_; int month_; diff --git a/browser/brave_stats/brave_stats_updater_unittest.cc b/browser/brave_stats/brave_stats_updater_unittest.cc index 29a127a9d1e..c0c37b80cca 100644 --- a/browser/brave_stats/brave_stats_updater_unittest.cc +++ b/browser/brave_stats/brave_stats_updater_unittest.cc @@ -14,7 +14,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_split.h" -#include "base/system/sys_info.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" @@ -104,7 +103,7 @@ class BraveStatsUpdaterTest : public testing::Test { std::unique_ptr BuildUpdaterParams( serp_metrics::SerpMetrics* serp_metrics) { return std::make_unique( - GetLocalState(), serp_metrics, brave_stats::ProcessArch::kArchSkip); + GetLocalState(), serp_metrics); } #if BUILDFLAG(ENABLE_BRAVE_ADS) @@ -154,8 +153,8 @@ TEST_F(BraveStatsUpdaterTest, IsDailyUpdateNeededLastCheckedYesterday) { GetLocalState()->SetString(kLastCheckYMD, kYesterday); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetDailyParam(), "true"); brave_stats_updater_params.SavePrefs(); @@ -166,8 +165,8 @@ TEST_F(BraveStatsUpdaterTest, IsDailyUpdateNeededLastCheckedToday) { GetLocalState()->SetString(kLastCheckYMD, kToday); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetDailyParam(), "false"); brave_stats_updater_params.SavePrefs(); @@ -178,8 +177,8 @@ TEST_F(BraveStatsUpdaterTest, IsDailyUpdateNeededLastCheckedTomorrow) { GetLocalState()->SetString(kLastCheckYMD, kTomorrow); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetDailyParam(), "false"); brave_stats_updater_params.SavePrefs(); @@ -190,8 +189,8 @@ TEST_F(BraveStatsUpdaterTest, IsWeeklyUpdateNeededLastCheckedLastWeek) { GetLocalState()->SetInteger(kLastCheckWOY, kLastWeek); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetWeeklyParam(), "true"); brave_stats_updater_params.SavePrefs(); @@ -202,8 +201,8 @@ TEST_F(BraveStatsUpdaterTest, IsWeeklyUpdateNeededLastCheckedThisWeek) { GetLocalState()->SetInteger(kLastCheckWOY, kThisWeek); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetWeeklyParam(), "false"); brave_stats_updater_params.SavePrefs(); @@ -214,8 +213,8 @@ TEST_F(BraveStatsUpdaterTest, IsWeeklyUpdateNeededLastCheckedNextWeek) { GetLocalState()->SetInteger(kLastCheckWOY, kNextWeek); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetWeeklyParam(), "true"); brave_stats_updater_params.SavePrefs(); @@ -226,8 +225,8 @@ TEST_F(BraveStatsUpdaterTest, IsMonthlyUpdateNeededLastCheckedLastMonth) { GetLocalState()->SetInteger(kLastCheckMonth, kLastMonth); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetMonthlyParam(), "true"); brave_stats_updater_params.SavePrefs(); @@ -238,8 +237,8 @@ TEST_F(BraveStatsUpdaterTest, IsMonthlyUpdateNeededLastCheckedThisMonth) { GetLocalState()->SetInteger(kLastCheckMonth, kThisMonth); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetMonthlyParam(), "false"); brave_stats_updater_params.SavePrefs(); @@ -250,8 +249,8 @@ TEST_F(BraveStatsUpdaterTest, IsMonthlyUpdateNeededLastCheckedNextMonth) { GetLocalState()->SetInteger(kLastCheckMonth, kNextMonth); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetMonthlyParam(), "true"); brave_stats_updater_params.SavePrefs(); @@ -261,43 +260,21 @@ TEST_F(BraveStatsUpdaterTest, IsMonthlyUpdateNeededLastCheckedNextMonth) { #if BUILDFLAG(ENABLE_BRAVE_ADS) TEST_F(BraveStatsUpdaterTest, HasAdsDisabled) { brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); SetEnableAds(false); EXPECT_EQ(brave_stats_updater_params.GetAdsEnabledParam(), "false"); } TEST_F(BraveStatsUpdaterTest, HasAdsEnabled) { brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); SetEnableAds(true); EXPECT_EQ(brave_stats_updater_params.GetAdsEnabledParam(), "true"); } #endif // BUILDFLAG(ENABLE_BRAVE_ADS) -TEST_F(BraveStatsUpdaterTest, HasArchSkip) { - brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); - EXPECT_EQ(brave_stats_updater_params.GetProcessArchParam(), ""); -} - -TEST_F(BraveStatsUpdaterTest, HasArchVirt) { - brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchVirt, kToday, kThisWeek, kThisMonth); - EXPECT_EQ(brave_stats_updater_params.GetProcessArchParam(), "virt"); -} - -TEST_F(BraveStatsUpdaterTest, HasArchMetal) { - auto arch = base::SysInfo::OperatingSystemArchitecture(); - brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchMetal, kToday, kThisWeek, kThisMonth); - EXPECT_EQ(brave_stats_updater_params.GetProcessArchParam(), arch); -} - TEST_F(BraveStatsUpdaterTest, HasDateOfInstallationFirstRun) { base::Time::Exploded exploded; base::Time current_time; @@ -316,8 +293,8 @@ TEST_F(BraveStatsUpdaterTest, HasDateOfInstallationFirstRun) { SetCurrentTimeForTest(current_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(brave_stats_updater_params.GetDateOfInstallationParam(), "2018-11-04"); } @@ -343,8 +320,8 @@ TEST_F(BraveStatsUpdaterTest, HasDailyRetention) { SetCurrentTimeForTest(dtoi_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); SetCurrentTimeForTest(current_time); EXPECT_EQ(brave_stats_updater_params.GetDateOfInstallationParam(), "2018-11-04"); @@ -361,8 +338,8 @@ TEST_F(BraveStatsUpdaterTest, GetUpdateURLHasFirstAndDtoi) { SetCurrentTimeForTest(install_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); SetCurrentTimeForTest(current_time); GURL response = brave_stats_updater_params.GetUpdateURL( @@ -370,8 +347,6 @@ TEST_F(BraveStatsUpdaterTest, GetUpdateURLHasFirstAndDtoi) { "full brave version here"); base::StringPairs kv_pairs; - // this will return `false` because at least one argument has no value - // ex: `arch` will have an empty value (because of kArchSkip). base::SplitStringIntoKeyValuePairsUsingSubstr(response.query(), '=', "&", &kv_pairs); EXPECT_FALSE(kv_pairs.empty()); @@ -421,8 +396,8 @@ TEST_F(BraveStatsUpdaterTest, HasDailyRetentionExpiration) { SetCurrentTimeForTest(dtoi_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); SetCurrentTimeForTest(current_time); EXPECT_EQ(brave_stats_updater_params.GetDateOfInstallationParam(), "null"); } @@ -451,8 +426,7 @@ TEST_F(BraveStatsUpdaterTest, IsWeeklyUpdateNeededOnMondayLastCheckedOnSunday) { SetCurrentTimeForTest(current_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr); // Make sure that the weekly param was set to true, since this is // a new ISO week (#44) @@ -472,8 +446,7 @@ TEST_F(BraveStatsUpdaterTest, IsWeeklyUpdateNeededOnMondayLastCheckedOnSunday) { SetCurrentTimeForTest(current_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr); // Make sure that the weekly param was set to true, since this is // a new ISO week (#45) @@ -493,8 +466,7 @@ TEST_F(BraveStatsUpdaterTest, IsWeeklyUpdateNeededOnMondayLastCheckedOnSunday) { SetCurrentTimeForTest(current_time); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr); // Make sure that the weekly param was set to false, since this is // still the same ISO week (#45) @@ -526,8 +498,7 @@ TEST_F(BraveStatsUpdaterTest, HasCorrectWeekOfInstallation) { // Make sure that week of installation is previous Monday brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr); EXPECT_EQ(brave_stats_updater_params.GetWeekOfInstallationParam(), "2019-03-18"); } @@ -549,8 +520,7 @@ TEST_F(BraveStatsUpdaterTest, HasCorrectWeekOfInstallation) { // Make sure that week of installation is today, since today is a // Monday brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr); EXPECT_EQ(brave_stats_updater_params.GetWeekOfInstallationParam(), "2019-03-25"); } @@ -571,8 +541,7 @@ TEST_F(BraveStatsUpdaterTest, HasCorrectWeekOfInstallation) { // Make sure that week of installation is previous Monday brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr); EXPECT_EQ(brave_stats_updater_params.GetWeekOfInstallationParam(), "2019-03-25"); } @@ -615,8 +584,8 @@ TEST_F(BraveStatsUpdaterTest, UsageBitstringDaily) { EXPECT_TRUE(base::Time::FromString("2020-03-30", &last_reported_use)); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(0b001, brave_stats::UsageBitfieldFromTimestamp(last_use, last_reported_use)); @@ -630,8 +599,8 @@ TEST_F(BraveStatsUpdaterTest, UsageBitstringWeekly) { EXPECT_TRUE(base::Time::FromString("2020-03-26", &last_reported_use)); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(0b011, brave_stats::UsageBitfieldFromTimestamp(last_use, last_reported_use)); @@ -645,8 +614,8 @@ TEST_F(BraveStatsUpdaterTest, UsageBitstringMonthlySameWeek) { EXPECT_TRUE(base::Time::FromString("2020-06-30", &last_reported_use)); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(0b101, brave_stats::UsageBitfieldFromTimestamp(last_use, last_reported_use)); } @@ -659,8 +628,8 @@ TEST_F(BraveStatsUpdaterTest, UsageBitstringMonthlyDiffWeek) { EXPECT_TRUE(base::Time::FromString("2020-02-15", &last_reported_use)); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(0b111, brave_stats::UsageBitfieldFromTimestamp(last_use, last_reported_use)); } @@ -673,8 +642,8 @@ TEST_F(BraveStatsUpdaterTest, UsageBitstringInactive) { EXPECT_TRUE(base::Time::FromString("2020-03-31", &last_reported_use)); brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(0b000, brave_stats::UsageBitfieldFromTimestamp(last_use, last_reported_use)); } @@ -684,8 +653,8 @@ TEST_F(BraveStatsUpdaterTest, UsageBitstringNeverUsed) { base::Time last_use; brave_stats::BraveStatsUpdaterParams brave_stats_updater_params( - GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, - brave_stats::ProcessArch::kArchSkip, kToday, kThisWeek, kThisMonth); + GetLocalState(), /*serp_metrics::SerpMetrics=*/nullptr, kToday, kThisWeek, + kThisMonth); EXPECT_EQ(0b000, brave_stats::UsageBitfieldFromTimestamp(last_use, last_reported_use)); } diff --git a/components/brave_stats/browser/brave_stats_updater_util.cc b/components/brave_stats/browser/brave_stats_updater_util.cc index f10db6ee826..d420892a00e 100644 --- a/components/brave_stats/browser/brave_stats_updater_util.cc +++ b/components/brave_stats/browser/brave_stats_updater_util.cc @@ -14,6 +14,7 @@ #include "base/environment.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/system/sys_info.h" #include "brave/components/brave_stats/browser/buildflags.h" #include "brave/components/constants/pref_names.h" #include "build/build_config.h" diff --git a/components/brave_stats/browser/brave_stats_updater_util.h b/components/brave_stats/browser/brave_stats_updater_util.h index 835a4c36634..6665cde827e 100644 --- a/components/brave_stats/browser/brave_stats_updater_util.h +++ b/components/brave_stats/browser/brave_stats_updater_util.h @@ -9,19 +9,12 @@ #include #include -#include "base/system/sys_info.h" #include "base/time/time.h" class PrefService; namespace brave_stats { -enum class ProcessArch { - kArchSkip, - kArchMetal, - kArchVirt, -}; - std::string GetDateAsYMD(const base::Time& time); // Returns platform with architecture information i.e. winx64-bc, osxarm64-bc