Remove redundant tab FeatureFlag checks in FeatureUtilities.

Also remove DOWNLOAD_TAB_MANAGEMENT_MODULE since it becomes unused.

Bug: 1012975
Change-Id: I8a687bc395ebb1d0f775eb7b83321047ba4ecb52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863033Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709045}

chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java

@@ -240,7 +240,6 @@ public abstract class ChromeFeatureList {
     public static final String DOWNLOAD_OFFLINE_CONTENT_PROVIDER =
             "UseDownloadOfflineContentProvider";
     public static final String DOWNLOADS_LOCATION_CHANGE = "DownloadsLocationChange";
-    public static final String DOWNLOAD_TAB_MANAGEMENT_MODULE = "DownloadTabManagementModule";
     public static final String DRAW_VERTICALLY_EDGE_TO_EDGE = "DrawVerticallyEdgeToEdge";
     public static final String EPHEMERAL_TAB = "EphemeralTab";
     public static final String EPHEMERAL_TAB_USING_BOTTOM_SHEET = "EphemeralTabUsingBottomSheet";

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java

@@ -516,12 +516,8 @@ public class FeatureUtilities {
     private static void cacheGridTabSwitcherEnabled() {
         ChromePreferenceManager.getInstance().writeBoolean(GRID_TAB_SWITCHER_ENABLED_KEY,
                 !DeviceClassManager.enableAccessibilityLayout()
-                        && (ChromeFeatureList.isEnabled(
-                                    ChromeFeatureList.DOWNLOAD_TAB_MANAGEMENT_MODULE)
-                                || ChromeFeatureList.isEnabled(
-                                        ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID))
-                        && TabManagementModuleProvider.getDelegate() != null
-                        && ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID));
+                        && ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID)
+                        && TabManagementModuleProvider.getDelegate() != null);
     }
 
     /**
@@ -546,13 +542,8 @@ public class FeatureUtilities {
     private static void cacheTabGroupsAndroidEnabled() {
         ChromePreferenceManager.getInstance().writeBoolean(TAB_GROUPS_ANDROID_ENABLED_KEY,
                 !DeviceClassManager.enableAccessibilityLayout()
-                        && (ChromeFeatureList.isEnabled(
-                                    ChromeFeatureList.DOWNLOAD_TAB_MANAGEMENT_MODULE)
-                                || ChromeFeatureList.isEnabled(
-                                        ChromeFeatureList.TAB_GROUPS_ANDROID))
-                        && TabManagementModuleProvider.getDelegate() != null
                         && ChromeFeatureList.isEnabled(ChromeFeatureList.TAB_GROUPS_ANDROID)
-                        && isHighEndPhone());
+                        && TabManagementModuleProvider.getDelegate() != null && isHighEndPhone());
     }
 
     /**

chrome/browser/android/chrome_feature_list.cc

@@ -136,7 +136,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kDownloadNotificationBadge,
     &kDownloadProgressInfoBar,
     &kDownloadRename,
-    &kDownloadTabManagementModule,
     &kDrawVerticallyEdgeToEdge,
     &kEphemeralTab,
     &kEphemeralTabUsingBottomSheet,
@@ -417,9 +416,6 @@ const base::Feature kDownloadNotificationBadge{
 const base::Feature kDownloadRename{"DownloadRename",
                                     base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kDownloadTabManagementModule{
-    "DownloadTabManagementModule", base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kEphemeralTab{"EphemeralTab",
                                   base::FEATURE_DISABLED_BY_DEFAULT};
 

chrome/browser/android/chrome_feature_list.h

@@ -69,7 +69,6 @@ extern const base::Feature kDownloadLocationShowImageInGallery;
 extern const base::Feature kDownloadNotificationBadge;
 extern const base::Feature kDownloadProgressInfoBar;
 extern const base::Feature kDownloadRename;
-extern const base::Feature kDownloadTabManagementModule;
 extern const base::Feature kDrawVerticallyEdgeToEdge;
 extern const base::Feature kEphemeralTab;
 extern const base::Feature kEphemeralTabUsingBottomSheet;