Merge pull request #21776 from brave/add_zerodayflag_android

Add zerodayflag android

android/java/org/chromium/base/BraveFeatureList.java

@@ -31,4 +31,5 @@ public abstract class BraveFeatureList {
     public static final String AI_CHAT = "AIChat";
     public static final String BRAVE_SHOW_STRICT_FINGERPRINTING_MODE =
             "BraveShowStrictFingerprintingMode";
+    public static final String BRAVE_ZERO_DAY_FLAG_ANDROID = "BraveZeroDayFlagAndroid";
 }

browser/about_flags.cc

@@ -362,9 +362,18 @@
       kOsAndroid,                                                             \
       FEATURE_VALUE_TYPE(safe_browsing::features::kBraveAndroidSafeBrowsing), \
   })
+#define BRAVE_ZERO_DAY_FLAG_ANDROID                                        \
+  EXPAND_FEATURE_ENTRIES({                                                 \
+      "brave-zero-day-flag-android",                                       \
+      "ZeroDayFlag flag for product test",                                 \
+      "This flag will be set through griffin to perform product testing",  \
+      kOsAndroid,                                                          \
+      FEATURE_VALUE_TYPE(preferences::features::kBraveZeroDayFlagAndroid), \
+  })
 #else
 #define BRAVE_BACKGROUND_VIDEO_PLAYBACK_ANDROID
 #define BRAVE_SAFE_BROWSING_ANDROID
+#define BRAVE_ZERO_DAY_FLAG_ANDROID
 #endif  // BUILDFLAG(IS_ANDROID)
 
 #if !BUILDFLAG(IS_ANDROID)
@@ -953,6 +962,7 @@
   BRAVE_COMMANDS_FEATURE_ENTRIES                                               \
   BRAVE_BACKGROUND_VIDEO_PLAYBACK_ANDROID                                      \
   BRAVE_SAFE_BROWSING_ANDROID                                                  \
+  BRAVE_ZERO_DAY_FLAG_ANDROID                                                  \
   BRAVE_CHANGE_ACTIVE_TAB_ON_SCROLL_EVENT_FEATURE_ENTRIES                      \
   BRAVE_TABS_FEATURE_ENTRIES                                                   \
   BRAVE_AI_CHAT                                                                \

browser/android/preferences/features.cc

@@ -15,5 +15,9 @@ BASE_FEATURE(kBraveBackgroundVideoPlayback,
              "BraveBackgroundVideoPlayback",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
+BASE_FEATURE(kBraveZeroDayFlagAndroid,
+             "BraveZeroDayFlagAndroid",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
 }  // namespace features
 }  // namespace preferences

browser/android/preferences/features.h

@@ -12,6 +12,7 @@ namespace preferences {
 namespace features {
 
 BASE_DECLARE_FEATURE(kBraveBackgroundVideoPlayback);
+BASE_DECLARE_FEATURE(kBraveZeroDayFlagAndroid);
 
 }  // namespace features
 }  // namespace preferences

browser/brave_browser_features.h

@@ -14,6 +14,7 @@ BASE_DECLARE_FEATURE(kBraveCleanupSessionCookiesOnSessionRestore);
 BASE_DECLARE_FEATURE(kBraveCopyCleanLinkByDefault);
 BASE_DECLARE_FEATURE(kBraveOverrideDownloadDangerLevel);
 BASE_DECLARE_FEATURE(kBraveWebViewRoundedCorners);
+BASE_DECLARE_FEATURE(kBraveZeroDayFlagAndroid);
 
 }  // namespace features
 

chromium_src/chrome/browser/flags/android/chrome_feature_list.cc

@@ -37,6 +37,7 @@
     &brave_wallet::features::kNativeBraveWalletFeature,                 \
     &playlist::features::kPlaylist,                                     \
     &preferences::features::kBraveBackgroundVideoPlayback,              \
+    &preferences::features::kBraveZeroDayFlagAndroid,                   \
     &request_otr::features::kBraveRequestOTRTab,                        \
     &safe_browsing::features::kBraveAndroidSafeBrowsing,                \
     &speedreader::kSpeedreaderFeature,                                  \