From a5bc6267716c730dff0b316193e91fa2bd5682be Mon Sep 17 00:00:00 2001 From: Serg Date: Mon, 24 Nov 2025 15:29:50 -0500 Subject: [PATCH] [Android]Renames kBraveFreshNtpAfterIdleExpirementVariant to kBraveFreshNtpAfterIdleExperimentVariant (#32499) [Android]Renames kBraveFreshNtpAfterIdleExpirementVariant to kBraveFreshNtpAfterIdleExperimentVariant. Resolves: https://github.com/brave/brave-browser/issues/51045 --- .../org/chromium/base/BraveFeatureList.java | 4 +-- .../browser/app/flags/BraveCachedFlags.java | 12 ++++---- .../browser/ntp/BraveFreshNtpHelper.java | 4 +-- .../BackgroundImagesPreferencesTest.java | 30 +++++++++---------- browser/brave_browser_features.cc | 6 ++-- browser/brave_browser_features.h | 4 +-- .../flags/android/chrome_feature_list.cc | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/android/java/org/chromium/base/BraveFeatureList.java b/android/java/org/chromium/base/BraveFeatureList.java index 4455764e97d..4fe6c63efaf 100644 --- a/android/java/org/chromium/base/BraveFeatureList.java +++ b/android/java/org/chromium/base/BraveFeatureList.java @@ -35,8 +35,8 @@ public abstract class BraveFeatureList { "BraveShowStrictFingerprintingMode"; public static final String BRAVE_DAY_ZERO_EXPERIMENT = "BraveDayZeroExperiment"; public static final String BRAVE_NEW_ANDROID_ONBOARDING = "NewAndroidOnboarding"; - public static final String BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT = - "BraveFreshNtpAfterIdleExpirement"; + public static final String BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT = + "BraveFreshNtpAfterIdleExperiment"; public static final String BRAVE_FALLBACK_DOH_PROVIDER = "BraveFallbackDoHProvider"; public static final String BRAVE_BLOCK_ALL_COOKIES_TOGGLE = "BlockAllCookiesToggle"; public static final String BRAVE_SHIELDS_ELEMENT_PICKER = "BraveShieldsElementPicker"; diff --git a/android/java/org/chromium/chrome/browser/app/flags/BraveCachedFlags.java b/android/java/org/chromium/chrome/browser/app/flags/BraveCachedFlags.java index 0ab5347f350..7c95315d16d 100644 --- a/android/java/org/chromium/chrome/browser/app/flags/BraveCachedFlags.java +++ b/android/java/org/chromium/chrome/browser/app/flags/BraveCachedFlags.java @@ -20,26 +20,26 @@ import java.util.List; public class BraveCachedFlags extends ChromeCachedFlags { // Cached feature flag for fresh NTP after idle expiration - safe to access before native is // ready - public static final CachedFlag sBraveFreshNtpAfterIdleExpirementEnabled = + public static final CachedFlag sBraveFreshNtpAfterIdleExperimentEnabled = new CachedFlag( ChromeFeatureMap.getInstance(), - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT, + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT, false); // Cached variant parameter for fresh NTP experiment - safe to access before native is ready - public static final StringCachedFeatureParam sBraveFreshNtpAfterIdleExpirementVariant = + public static final StringCachedFeatureParam sBraveFreshNtpAfterIdleExperimentVariant = new StringCachedFeatureParam( ChromeFeatureMap.getInstance(), - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT, + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT, "variant", "A"); // List of cached flags for Brave features - safe to access before native is ready private static final List sBraveFlagsCached = - List.of(sBraveFreshNtpAfterIdleExpirementEnabled); + List.of(sBraveFreshNtpAfterIdleExperimentEnabled); // List of cached feature params for Brave features - safe to access before native is ready private static final List> sBraveFeatureParamsCached = - List.of(sBraveFreshNtpAfterIdleExpirementVariant); + List.of(sBraveFreshNtpAfterIdleExperimentVariant); BraveCachedFlags() { BraveCachedFeatureParam.setBraveParams(sBraveFeatureParamsCached); diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveFreshNtpHelper.java b/android/java/org/chromium/chrome/browser/ntp/BraveFreshNtpHelper.java index 086a8d720fa..e1377f44465 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveFreshNtpHelper.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveFreshNtpHelper.java @@ -20,7 +20,7 @@ public class BraveFreshNtpHelper { * flag, so it's safe to call even before native is ready. */ public static boolean isEnabled() { - return BraveCachedFlags.sBraveFreshNtpAfterIdleExpirementEnabled.isEnabled(); + return BraveCachedFlags.sBraveFreshNtpAfterIdleExperimentEnabled.isEnabled(); } /** @@ -31,6 +31,6 @@ public class BraveFreshNtpHelper { * @return The variant string. */ public static String getVariant() { - return BraveCachedFlags.sBraveFreshNtpAfterIdleExpirementVariant.getValue(); + return BraveCachedFlags.sBraveFreshNtpAfterIdleExperimentVariant.getValue(); } } diff --git a/android/javatests/org/chromium/chrome/browser/settings/BackgroundImagesPreferencesTest.java b/android/javatests/org/chromium/chrome/browser/settings/BackgroundImagesPreferencesTest.java index c6c1c0687c5..4d42470e295 100644 --- a/android/javatests/org/chromium/chrome/browser/settings/BackgroundImagesPreferencesTest.java +++ b/android/javatests/org/chromium/chrome/browser/settings/BackgroundImagesPreferencesTest.java @@ -49,12 +49,12 @@ public class BackgroundImagesPreferencesTest { // Test for Opening Screen preference when feature is disabled. It should not be shown. @Test @SmallTest - @DisableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT) + @DisableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT) public void testOpeningScreenPrefNotShownWhenFeatureDisabled() { Assert.assertFalse( - "BraveFreshNtpAfterIdleExpirement feature should be disabled", + "BraveFreshNtpAfterIdleExperiment feature should be disabled", ChromeFeatureList.isEnabled( - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT)); + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT)); startSettings(); // Wait for async preference updates to complete @@ -94,12 +94,12 @@ public class BackgroundImagesPreferencesTest { // The preference should not be shown when variant is "A" (the default). @Test @SmallTest - @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT) + @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT) public void testOpeningScreenPrefNotShownWhenFeatureEnabledButVariantIsA() { Assert.assertTrue( - "BraveFreshNtpAfterIdleExpirement feature should be enabled", + "BraveFreshNtpAfterIdleExperiment feature should be enabled", ChromeFeatureList.isEnabled( - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT)); + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT)); startSettings(); // Wait for async preference updates to complete @@ -140,12 +140,12 @@ public class BackgroundImagesPreferencesTest { // The preference should be shown when variant is not "A". @Test @SmallTest - @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT + ":variant/B") + @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT + ":variant/B") public void testOpeningScreenPrefShownWhenFeatureEnabledAndVariantIsB() { Assert.assertTrue( - "BraveFreshNtpAfterIdleExpirement feature should be enabled", + "BraveFreshNtpAfterIdleExperiment feature should be enabled", ChromeFeatureList.isEnabled( - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT)); + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT)); startSettings(); // Wait for async preference updates to complete @@ -187,12 +187,12 @@ public class BackgroundImagesPreferencesTest { // The preference should be shown when variant is not "A". @Test @SmallTest - @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT + ":variant/C") + @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT + ":variant/C") public void testOpeningScreenPrefShownWhenFeatureEnabledAndVariantIsC() { Assert.assertTrue( - "BraveFreshNtpAfterIdleExpirement feature should be enabled", + "BraveFreshNtpAfterIdleExperiment feature should be enabled", ChromeFeatureList.isEnabled( - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT)); + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT)); startSettings(); // Wait for async preference updates to complete @@ -234,12 +234,12 @@ public class BackgroundImagesPreferencesTest { // The preference should be shown when variant is not "A". @Test @SmallTest - @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT + ":variant/D") + @EnableFeatures(BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT + ":variant/D") public void testOpeningScreenPrefShownWhenFeatureEnabledAndVariantIsD() { Assert.assertTrue( - "BraveFreshNtpAfterIdleExpirement feature should be enabled", + "BraveFreshNtpAfterIdleExperiment feature should be enabled", ChromeFeatureList.isEnabled( - BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPIREMENT)); + BraveFeatureList.BRAVE_FRESH_NTP_AFTER_IDLE_EXPERIMENT)); startSettings(); // Wait for async preference updates to complete diff --git a/browser/brave_browser_features.cc b/browser/brave_browser_features.cc index ecbc2adff38..02868de03fa 100644 --- a/browser/brave_browser_features.cc +++ b/browser/brave_browser_features.cc @@ -66,7 +66,7 @@ BASE_FEATURE(kBraveAndroidDynamicColors, // Enable fresh NTP display after idle expiration on Android. // This feature allows showing a refreshed NTP when the app has been idle // for a specified duration. -BASE_FEATURE(kBraveFreshNtpAfterIdleExpirement, +BASE_FEATURE(kBraveFreshNtpAfterIdleExperiment, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_ANDROID) @@ -78,8 +78,8 @@ const base::FeatureParam kBraveDayZeroExperimentVariant{ #if BUILDFLAG(IS_ANDROID) // The variant of the fresh NTP experiment. i.e. A, B, C, etc. -const base::FeatureParam kBraveFreshNtpAfterIdleExpirementVariant{ - &kBraveFreshNtpAfterIdleExpirement, +const base::FeatureParam kBraveFreshNtpAfterIdleExperimentVariant{ + &kBraveFreshNtpAfterIdleExperiment, /*name=*/"variant", /*default_value=*/"A"}; #endif // BUILDFLAG(IS_ANDROID) diff --git a/browser/brave_browser_features.h b/browser/brave_browser_features.h index 1ab1cc49608..a17148c6b18 100644 --- a/browser/brave_browser_features.h +++ b/browser/brave_browser_features.h @@ -27,14 +27,14 @@ BASE_DECLARE_FEATURE(kBraveV8JitlessMode); #if BUILDFLAG(IS_ANDROID) BASE_DECLARE_FEATURE(kBraveAndroidDynamicColors); BASE_DECLARE_FEATURE(kNewAndroidOnboarding); -BASE_DECLARE_FEATURE(kBraveFreshNtpAfterIdleExpirement); +BASE_DECLARE_FEATURE(kBraveFreshNtpAfterIdleExperiment); #endif // BUILDFLAG(IS_ANDROID) extern const base::FeatureParam kBraveDayZeroExperimentVariant; #if BUILDFLAG(IS_ANDROID) extern const base::FeatureParam - kBraveFreshNtpAfterIdleExpirementVariant; + kBraveFreshNtpAfterIdleExperimentVariant; #endif // BUILDFLAG(IS_ANDROID) } // namespace features diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc index e6be3498d29..d0c7e11970b 100644 --- a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc @@ -74,7 +74,7 @@ &brave_shields::features::kBraveShieldsElementPicker, \ &features::kBraveAndroidDynamicColors, \ &features::kNewAndroidOnboarding, \ - &features::kBraveFreshNtpAfterIdleExpirement, \ + &features::kBraveFreshNtpAfterIdleExperiment, \ &brave_ads::kNewTabPageAdFeature, \ &ntp_background_images::features::kBraveNTPBrandedWallpaperSurveyPanelist, \ &brave_account::features::kBraveAccount, \