From 46d1e5e7014ff60678a8fb0bedc73c3779ebee0f Mon Sep 17 00:00:00 2001 From: Netzenbot Date: Thu, 9 Apr 2026 07:44:47 -0400 Subject: [PATCH] Fix MetricsUtilTest.DefaultValueTest on origin builds (#35388) The test expected GetDefaultPrefValueForMetricsReporting() to return true for beta/dev/nightly channels, but on origin-branded builds the function unconditionally returns false (added in 2d48fb7f592). Update the test expectations to account for IS_BRAVE_ORIGIN_BRANDED. Resolves brave/brave-browser#54242 --- browser/metrics/BUILD.gn | 1 + .../metrics_reporting_util_unittest_linux.cc | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/browser/metrics/BUILD.gn b/browser/metrics/BUILD.gn index e5272bbb1b4..c5b0a79b5a7 100644 --- a/browser/metrics/BUILD.gn +++ b/browser/metrics/BUILD.gn @@ -45,6 +45,7 @@ source_set("brave_metrics_unit_tests") { configs += [ "//brave/build/linux:linux_channel_names" ] deps += [ + "//brave/components/brave_origin/buildflags", "//chrome/common:channel_info", "//components/version_info:channel", ] diff --git a/browser/metrics/metrics_reporting_util_unittest_linux.cc b/browser/metrics/metrics_reporting_util_unittest_linux.cc index fd612a48740..8915b450b8e 100644 --- a/browser/metrics/metrics_reporting_util_unittest_linux.cc +++ b/browser/metrics/metrics_reporting_util_unittest_linux.cc @@ -3,9 +3,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "brave/browser/metrics/metrics_reporting_util.h" - #include "base/environment.h" +#include "brave/browser/metrics/metrics_reporting_util.h" +#include "brave/components/brave_origin/buildflags/buildflags.h" #include "chrome/common/channel_info.h" #include "components/version_info/channel.h" #include "testing/gtest/include/gtest/gtest.h" @@ -20,15 +20,27 @@ TEST(MetricsUtilTest, DefaultValueTest) { env->SetVar("CHROME_VERSION_EXTRA", LINUX_CHANNEL_BETA); EXPECT_EQ(version_info::Channel::BETA, chrome::GetChannel()); +#if BUILDFLAG(IS_BRAVE_ORIGIN_BRANDED) + EXPECT_FALSE(GetDefaultPrefValueForMetricsReporting()); +#else EXPECT_TRUE(GetDefaultPrefValueForMetricsReporting()); +#endif env->SetVar("CHROME_VERSION_EXTRA", LINUX_CHANNEL_DEV); EXPECT_EQ(version_info::Channel::DEV, chrome::GetChannel()); +#if BUILDFLAG(IS_BRAVE_ORIGIN_BRANDED) + EXPECT_FALSE(GetDefaultPrefValueForMetricsReporting()); +#else EXPECT_TRUE(GetDefaultPrefValueForMetricsReporting()); +#endif env->SetVar("CHROME_VERSION_EXTRA", BRAVE_LINUX_CHANNEL_NIGHTLY); EXPECT_EQ(version_info::Channel::CANARY, chrome::GetChannel()); +#if BUILDFLAG(IS_BRAVE_ORIGIN_BRANDED) + EXPECT_FALSE(GetDefaultPrefValueForMetricsReporting()); +#else EXPECT_TRUE(GetDefaultPrefValueForMetricsReporting()); +#endif #else // OFFICIAL_BUILD EXPECT_EQ(version_info::Channel::UNKNOWN, chrome::GetChannel()); EXPECT_FALSE(GetDefaultPrefValueForMetricsReporting());