Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 029f26f5 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

v109 patches 

- Remove CachedFeatureFlags#sDefaults
https://source.chromium.org/chromium/chromium/src/+/aec86b4698c914db19b33fe3ea1b455cc4fb905f
parent fd697a78

build/patches/Add-AllowUserCertificates-flag.patch

+17 −29
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 chrome/browser/flag_descriptions.h                           | 3 +++

 chrome/browser/flags/android/chrome_feature_list.cc          | 5 +++++

 chrome/browser/flags/android/chrome_feature_list.h           | 1 +

 .../chromium/chrome/browser/flags/CachedFeatureFlags.java    | 1 +

 .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++

 net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++

 10 files changed, 31 insertions(+)

 9 files changed, 30 insertions(+)



diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -28,7 +27,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -951,6 +952,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -961,6 +962,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         UpdateMenuItemHelper.getInstance().onStart();

         ChromeActivitySessionTracker.getInstance().onStartWithNative();

         ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -40,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java

@@ -78,6 +78,7 @@ public class ChromeCachedFlags {

@@ -77,6 +77,7 @@ public class ChromeCachedFlags {

                 add(ChromeFeatureList.sAndroidAuxiliarySearch);

                 add(ChromeFeatureList.sAnonymousUpdateChecks);

                 add(ChromeFeatureList.sAppMenuMobileSiteOption);
@@ -51,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom 
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -8830,6 +8830,10 @@ const FeatureEntry kFeatureEntries[] = {

@@ -8936,6 +8936,10 @@ const FeatureEntry kFeatureEntries[] = {

      FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},

 #endif  // BUILDFLAG(IS_WIN)
@@ -93,15 +92,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedNoViewCache,

@@ -153,6 +153,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedReplaceAll,

     &feed::kFeedShowSignInCommand,

     &feed::kInterestFeedContentSuggestions,

+    &kAllowUserCertificates,

     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Autoplay,

@@ -468,6 +469,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,

@@ -469,6 +470,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,

              "AllowNewIncognitoTabIntents",

              base::FEATURE_ENABLED_BY_DEFAULT);
@@ -115,29 +114,18 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

--- a/chrome/browser/flags/android/chrome_feature_list.h

+++ b/chrome/browser/flags/android/chrome_feature_list.h

@@ -12,6 +12,7 @@

 namespace chrome {

 namespace android {

 

+extern const base::Feature kAllowUserCertificates;

 // Alphabetical:

 BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar);

@@ -17,6 +17,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar);

 BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

@@ -50,6 +50,7 @@ public class CachedFeatureFlags {

             ImmutableMap.<String, Boolean>builder()

                     .put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true)

                     .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false)

+                    .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false)

                     .put(ChromeFeatureList.BACK_GESTURE_REFACTOR, false)

                     .put(ChromeFeatureList.CCT_BRAND_TRANSPARENCY, false)

                     .put(ChromeFeatureList.CCT_INCOGNITO, true)

 BASE_DECLARE_FEATURE(kAddToHomescreenIPH);

 BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents);

+BASE_DECLARE_FEATURE(kAllowUserCertificates);

 BASE_DECLARE_FEATURE(kAndroidScrollOptimizations);

 BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);

 BASE_DECLARE_FEATURE(kAssistantConsentModal);

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -193,6 +193,7 @@ public abstract class ChromeFeatureList {

@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList {

     }

 

     /* Alphabetical: */
@@ -145,8 +133,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList {

     public static final String FEED_REPLACE_ALL = "FeedReplaceAll";

@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList {

             "SkipServiceWorkerForInstallPromot";

 

     /* Alphabetical: */

+    public static final CachedFlag sAllowUserCertificates =

build/patches/Disable-AGSA-by-default.patch

+15 −28
Original line number Diff line number Diff line
@@ -14,15 +14,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../browser/ntp/search/SearchBoxMediator.java |  1 -

 .../chrome/browser/share/LensUtils.java       | 12 +--------

 .../flags/android/chrome_feature_list.cc      |  4 +--

 .../browser/flags/CachedFeatureFlags.java     |  2 +-

 chrome/browser/ui/android/omnibox/BUILD.gn    |  2 --

 .../browser/omnibox/LocationBarMediator.java  |  1 -

 13 files changed, 4 insertions(+), 78 deletions(-)

 12 files changed, 3 insertions(+), 77 deletions(-)



diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -408,7 +408,6 @@ if (current_toolchain == default_toolchain) {

@@ -420,7 +420,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/first_run/android:java",

       "//chrome/browser/flags:java",

       "//chrome/browser/fullscreen/android:java",
@@ -30,7 +29,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 
       "//chrome/browser/history_clusters:java",

       "//chrome/browser/history_clusters:java_resources",

       "//chrome/browser/image_descriptions:java",

@@ -1002,7 +1001,6 @@ if (current_toolchain == default_toolchain) {

@@ -1015,7 +1014,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/flags:flags_junit_tests",

       "//chrome/browser/flags:java",

       "//chrome/browser/fullscreen/android:java",
@@ -38,7 +37,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn 
       "//chrome/browser/history_clusters:java",

       "//chrome/browser/image_descriptions:java",

       "//chrome/browser/image_editor/public:java",

@@ -1517,7 +1515,6 @@ if (current_toolchain == default_toolchain) {

@@ -1531,7 +1529,6 @@ if (current_toolchain == default_toolchain) {

       "//chrome/browser/first_run/android:java",

       "//chrome/browser/flags:java",

       "//chrome/browser/fullscreen/android:java",
@@ -60,15 +59,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java

@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection;

 import org.chromium.chrome.browser.document.ChromeLauncherActivity;

@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;

 import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;

 import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;

 import org.chromium.chrome.browser.flags.ChromeFeatureList;

-import org.chromium.chrome.browser.gsa.GSAState;

 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;

 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;

 import org.chromium.chrome.browser.profiles.Profile;

@@ -265,8 +264,6 @@ public class IntentHandler {

@@ -267,8 +266,6 @@ public class IntentHandler {

     private static int sReferrerId;

     private static String sPendingIncognitoUrl;
@@ -77,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j 
     private static final String PACKAGE_GMAIL = "com.google.android.gm";

     private static final String PACKAGE_PLUS = "com.google.android.apps.plus";

     private static final String PACKAGE_HANGOUTS = "com.google.android.talk";

@@ -496,8 +493,6 @@ public class IntentHandler {

@@ -498,8 +495,6 @@ public class IntentHandler {

             return ExternalAppId.LINE;

         } else if (packageName.equals(PACKAGE_WHATSAPP)) {

             return ExternalAppId.WHATSAPP;
@@ -89,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -112,10 +112,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;

@@ -113,10 +113,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;

 import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier;

 import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler;

 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ -100,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.chrome.browser.history.HistoryManagerUtils;

 import org.chromium.chrome.browser.init.AsyncInitializationActivity;

 import org.chromium.chrome.browser.init.ProcessInitializationHandler;

@@ -374,8 +370,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -377,8 +373,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 

     private LaunchCauseMetrics mLaunchCauseMetrics;
@@ -109,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
     // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity.

     private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers =

             new ArrayList<>();

@@ -1172,10 +1166,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -1189,10 +1183,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 

     @Override

     public void onStopWithNative() {
@@ -120,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
         super.onStopWithNative();

     }

 

@@ -1267,23 +1257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -1284,23 +1274,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

                     .recordUserFontPrefOnStartup();

         });
@@ -155,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr 
 import org.chromium.chrome.browser.lens.LensController;

 import org.chromium.chrome.browser.lens.LensEntryPoint;

 import org.chromium.chrome.browser.lens.LensIntentParams;

@@ -987,12 +986,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

@@ -978,12 +977,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

                     LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);

             return false;

         }
@@ -196,7 +195,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -360,14 +360,6 @@ public class ProcessInitializationHandler {

@@ -356,14 +356,6 @@ public class ProcessInitializationHandler {

             }

         });
@@ -273,18 +272,6 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
 

 BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT);

 

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

@@ -72,7 +72,7 @@ public class CachedFeatureFlags {

                     .put(ChromeFeatureList.EARLY_LIBRARY_LOAD, true)

                     .put(ChromeFeatureList.ELASTIC_OVERSCROLL, true)

                     .put(ChromeFeatureList.ELIDE_PRIORITIZATION_OF_PRE_NATIVE_BOOTSTRAP_TASKS, true)

-                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true)

+                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false)

                     .put(ChromeFeatureList.FEED_LOADING_PLACEHOLDER, false)

                     .put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, true)

                     .put(ChromeFeatureList.IMMERSIVE_UI_MODE, false)

diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn

--- a/chrome/browser/ui/android/omnibox/BUILD.gn

+++ b/chrome/browser/ui/android/omnibox/BUILD.gn
@@ -296,7 +283,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr 
     "//chrome/browser/history_clusters:java",

     "//chrome/browser/language/android:java",

     "//chrome/browser/lens:java",

@@ -440,7 +439,6 @@ robolectric_library("junit") {

@@ -441,7 +440,6 @@ robolectric_library("junit") {

     "//chrome/browser/commerce/merchant_viewer/android:java",

     "//chrome/browser/device:java",

     "//chrome/browser/flags:java",

build/patches/Disable-feeds-support-by-default.patch

+2 −15
Original line number Diff line number Diff line
@@ -5,14 +5,13 @@ Subject: Disable feeds support by default 
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 .../org/chromium/chrome/browser/feed/FeedFeatures.java    | 8 +-------

 .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-

 components/feed/feed_feature_list.cc                      | 8 ++++----

 3 files changed, 6 insertions(+), 12 deletions(-)

 2 files changed, 5 insertions(+), 11 deletions(-)



diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java

--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java

+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java

@@ -50,13 +50,7 @@ public final class FeedFeatures {

@@ -48,13 +48,7 @@ public final class FeedFeatures {

      *         the user is signed in and confirms it's not a child profile.

      */

     public static boolean isWebFeedUIEnabled() {
@@ -27,18 +26,6 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe 
     }

 

     public static boolean shouldUseWebFeedAwarenessIPH() {

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

@@ -78,7 +78,7 @@ public class CachedFeatureFlags {

                     .put(ChromeFeatureList.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false)

                     .put(ChromeFeatureList.INSTANCE_SWITCHER, true)

                     .put(ChromeFeatureList.INSTANT_START, false)

-                    .put(ChromeFeatureList.INTEREST_FEED_V2, true)

+                    .put(ChromeFeatureList.INTEREST_FEED_V2, false)

                     .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false)

                     .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true)

                     .put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false)

diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc

--- a/components/feed/feed_feature_list.cc

+++ b/components/feed/feed_feature_list.cc

build/patches/Move-navigation-bar-to-bottom.patch

+99 −106

File changed.

Preview size limit exceeded, changes collapsed.

build/patches/Unexpire-tab-groups-flags.patch

+6 −19
Original line number Diff line number Diff line
@@ -8,13 +8,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
---

 chrome/browser/flag-metadata.json                   | 4 ++--

 chrome/browser/flags/android/chrome_feature_list.cc | 8 ++++----

 .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-

 3 files changed, 7 insertions(+), 7 deletions(-)

 2 files changed, 6 insertions(+), 6 deletions(-)



diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -3099,7 +3099,7 @@

@@ -3138,7 +3138,7 @@

   {

     "name": "enable-tab-groups",

     "owners": [ "memex-team@google.com" ],
@@ -23,7 +22,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 
   },

   {

     "name": "enable-tab-groups-continuation",

@@ -3114,7 +3114,7 @@

@@ -3153,7 +3153,7 @@

   {

     "name": "enable-tab-groups-ui-improvements",

     "owners": [ "memex-team@google.com" ],
@@ -35,7 +34,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -977,16 +977,16 @@ BASE_FEATURE(kTabEngagementReportingAndroid,

@@ -965,16 +965,16 @@ BASE_FEATURE(kTabEngagementReportingAndroid,

              base::FEATURE_DISABLED_BY_DEFAULT);

 

 BASE_FEATURE(kTabGroupsAndroid,
@@ -56,17 +55,5 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
 

 BASE_FEATURE(kTabGroupsForTablets,

              "TabGroupsForTablets",

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java

@@ -102,7 +102,7 @@ public class CachedFeatureFlags {

                     .put(ChromeFeatureList.STORE_HOURS, false)

                     .put(ChromeFeatureList.SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, true)

                     .put(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID, true)

-                    .put(ChromeFeatureList.TAB_GROUPS_ANDROID, true)

+                    .put(ChromeFeatureList.TAB_GROUPS_ANDROID, false)

                     .put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false)

                     .put(ChromeFeatureList.TAB_GROUPS_FOR_TABLETS, false)

                     .put(ChromeFeatureList.TAB_SELECTION_EDITOR_V2, false)

--

2.25.1