From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 17 May 2021 22:32:36 +0200
Subject: Unexpire tab groups flags

Disabled by default

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(-)

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 @@
   {
     "name": "enable-tab-groups",
     "owners": [ "memex-team@google.com" ],
-    "expiry_milestone": 90
+    "expiry_milestone": -1
   },
   {
     "name": "enable-tab-groups-continuation",
@@ -3114,7 +3114,7 @@
   {
     "name": "enable-tab-groups-ui-improvements",
     "owners": [ "memex-team@google.com" ],
-    "expiry_milestone": 90
+    "expiry_milestone": -1
   },
   {
     "name": "enable-tab-search",
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,
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 BASE_FEATURE(kTabGroupsAndroid,
-             "TabGroupsAndroid",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "TabGroupsAndroid",                   // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT);   // in Bromite
 
 BASE_FEATURE(kTabGroupsContinuationAndroid,
              "TabGroupsContinuationAndroid",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 BASE_FEATURE(kTabGroupsUiImprovementsAndroid,
-             "TabGroupsUiImprovementsAndroid",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "TabGroupsUiImprovementsAndroid",     // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT);   // in Bromite
 
 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
