diff --git a/DEPS b/DEPS index 5a51eac20b9..5ad4fd2766b 100644 --- a/DEPS +++ b/DEPS @@ -98,7 +98,7 @@ hooks = [ 'pattern': '.', 'condition': 'checkout_mac', 'action': ['vpython3', 'build/download_dep.py', - 'omaha4/BraveUpdater-141.1.84.102.zip', + 'omaha4/BraveUpdater-141.1.85.63.zip', '//brave/third_party/updater/mac', 'BraveUpdater.app/'], }, diff --git a/browser/about_flags.cc b/browser/about_flags.cc index cc09b8ff307..19fe653d9c0 100644 --- a/browser/about_flags.cc +++ b/browser/about_flags.cc @@ -669,13 +669,13 @@ constexpr flags_ui::FeatureEntry::Choice kVerticalTabCollapseDelayChoices[] = { #endif #if BUILDFLAG(ENABLE_OMAHA4) -#define BRAVE_UPDATER_FEATURE_ENTRIES \ - EXPAND_FEATURE_ENTRIES({ \ - "brave-use-omaha4-alpha", \ - "Use Omaha 4 Alpha", \ - "Use the new automatic update system", \ - kOsMac, \ - FEATURE_VALUE_TYPE(brave_updater::kBraveUseOmaha4Alpha), \ +#define BRAVE_UPDATER_FEATURE_ENTRIES \ + EXPAND_FEATURE_ENTRIES({ \ + "brave-use-omaha4", \ + "Use Omaha 4", \ + "Use the new automatic update system", \ + kOsMac, \ + FEATURE_VALUE_TYPE(brave_updater::kBraveUseOmaha4), \ }) #else #define BRAVE_UPDATER_FEATURE_ENTRIES diff --git a/browser/ui/webui/help/brave_version_updater_mac_unittest.mm b/browser/ui/webui/help/brave_version_updater_mac_unittest.mm index 0d57aa280e8..a07f106c184 100644 --- a/browser/ui/webui/help/brave_version_updater_mac_unittest.mm +++ b/browser/ui/webui/help/brave_version_updater_mac_unittest.mm @@ -24,14 +24,13 @@ class BraveVersionUpdaterMacTest : public testing::Test { }; TEST_F(BraveVersionUpdaterMacTest, UsesSparkleWhenFeatureDisabled) { - scoped_feature_list_.InitAndDisableFeature( - brave_updater::kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndDisableFeature(brave_updater::kBraveUseOmaha4); EXPECT_TRUE(UsesSparkle()); } TEST_F(BraveVersionUpdaterMacTest, UsesOmaha4WhenFeatureEnabled) { scoped_feature_list_.InitAndEnableFeatureWithParameters( - brave_updater::kBraveUseOmaha4Alpha, + brave_updater::kBraveUseOmaha4, {{brave_updater::kLegacyFallbackIntervalDays.name, base::NumberToString(INT_MAX)}}); EXPECT_FALSE(UsesSparkle()); diff --git a/browser/updater/features.cc b/browser/updater/features.cc index 1b64da1535d..e678f8114a9 100644 --- a/browser/updater/features.cc +++ b/browser/updater/features.cc @@ -12,18 +12,11 @@ namespace brave_updater { -// DO NOT TURN THIS FEATURE ON IN PRODUCTION. As of this writing, it only -// implements the happy path of switching from Sparkle to Omaha 4 on macOS. It -// does not handle switching from Omaha 4 back to Sparkle. When you do enable -// the feature in the future, make sure that it is not enabled for any clients -// that suffer from the above limitations. -BASE_FEATURE(kBraveUseOmaha4Alpha, - "BraveUseOmaha4Alpha", - base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kBraveUseOmaha4, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE_PARAM(int, kLegacyFallbackIntervalDays, - &kBraveUseOmaha4Alpha, + &kBraveUseOmaha4, "legacy-fallback-interval-days", 5); @@ -45,7 +38,7 @@ bool ShouldUseOmaha4Impl(base::Time now, std::optional& state) { if (days_since_null % legacy_fallback_interval_days == 0) { state = false; } else { - state = base::FeatureList::IsEnabled(kBraveUseOmaha4Alpha); + state = base::FeatureList::IsEnabled(kBraveUseOmaha4); } VLOG(1) << "Using Omaha 4: " << state.value(); } diff --git a/browser/updater/features.h b/browser/updater/features.h index 120c78de6e3..ad8415afbb4 100644 --- a/browser/updater/features.h +++ b/browser/updater/features.h @@ -14,7 +14,7 @@ namespace brave_updater { -BASE_DECLARE_FEATURE(kBraveUseOmaha4Alpha); +BASE_DECLARE_FEATURE(kBraveUseOmaha4); BASE_DECLARE_FEATURE_PARAM(int, kLegacyFallbackIntervalDays); bool ShouldUseOmaha4(); diff --git a/browser/updater/features_unittest.cc b/browser/updater/features_unittest.cc index a7f70f8d406..1dbc6fc13e3 100644 --- a/browser/updater/features_unittest.cc +++ b/browser/updater/features_unittest.cc @@ -25,36 +25,36 @@ class ShouldUseOmaha4Test : public testing::Test { }; TEST_F(ShouldUseOmaha4Test, ReturnsFalseWhenFeatureDisabled) { - scoped_feature_list_.InitAndDisableFeature(kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndDisableFeature(kBraveUseOmaha4); EXPECT_FALSE(ShouldUseOmaha4(1)); } TEST_F(ShouldUseOmaha4Test, ReturnsTrueWhenFeatureEnabled) { - scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4); EXPECT_TRUE(ShouldUseOmaha4(1)); } TEST_F(ShouldUseOmaha4Test, LetsLegacyImplRunEvenWhenFeatureEnabled) { - scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4); EXPECT_FALSE(ShouldUseOmaha4(5)); } TEST_F(ShouldUseOmaha4Test, StaysConstantWhenFeatureDisabled) { - scoped_feature_list_.InitAndDisableFeature(kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndDisableFeature(kBraveUseOmaha4); for (int day = 1; day < 10; day++) { EXPECT_FALSE(ShouldUseOmaha4(day)); } } TEST_F(ShouldUseOmaha4Test, StaysConstantWhenFeatureEnabled) { - scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4); for (int day = 1; day < 10; day++) { EXPECT_TRUE(ShouldUseOmaha4(day)); } } TEST_F(ShouldUseOmaha4Test, StaysConstantWhenLegacyImplRuns) { - scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4Alpha); + scoped_feature_list_.InitAndEnableFeature(kBraveUseOmaha4); // Trigger the `% 5 == 0` case on day 0. for (int day = 0; day < 10; day++) { EXPECT_FALSE(ShouldUseOmaha4(day)); diff --git a/chromium_src/chrome/updater/branding.gni b/chromium_src/chrome/updater/branding.gni index 63e67d80626..d066d370087 100644 --- a/chromium_src/chrome/updater/branding.gni +++ b/chromium_src/chrome/updater/branding.gni @@ -93,6 +93,6 @@ brave_updater_branding = { declare_args() { # Omaha 4 update server: update_check_url = - "https://updates.bravesoftware.com/non-stable/service/update2/json" + "https://updates.bravesoftware.com/prod/service/update2/json" } }