BASELINE: Update Chromium to 74.0.3729.159

Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

11 files changed, 99 insertions, 49 deletions

diff --git a/chromium/components/feature_engagement/features.gni b/chromium/components/feature_engagement/features.gni
index bfda1bc6289..72eaa1d7d53 100644
--- a/chromium/components/feature_engagement/features.gni
+++ b/chromium/components/feature_engagement/features.gni
@@ -4,7 +4,6 @@
 
 declare_args() {
   # In-Product Help is only available in Windows and Linux OS for
-  # desktop. Other platforms such as Mac OS currently does not support
-  # Views and there have been no strong feelings about CrOS.
+  # desktop.
   enable_desktop_in_product_help = is_win || (is_linux && !is_chromeos)
 }
diff --git a/chromium/components/feature_engagement/internal/never_availability_model.cc b/chromium/components/feature_engagement/internal/never_availability_model.cc
index 1b4615d8382..03eb01da3ac 100644
--- a/chromium/components/feature_engagement/internal/never_availability_model.cc
+++ b/chromium/components/feature_engagement/internal/never_availability_model.cc
@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/optional.h"
 #include "base/sequenced_task_runner.h"
diff --git a/chromium/components/feature_engagement/internal/persistent_event_store_unittest.cc b/chromium/components/feature_engagement/internal/persistent_event_store_unittest.cc
index 8297481a1ea..005e9f8515b 100644
--- a/chromium/components/feature_engagement/internal/persistent_event_store_unittest.cc
+++ b/chromium/components/feature_engagement/internal/persistent_event_store_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <map>
 
+#include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/optional.h"
 #include "base/test/metrics/histogram_tester.h"
diff --git a/chromium/components/feature_engagement/internal/tracker_impl.cc b/chromium/components/feature_engagement/internal/tracker_impl.cc
index 3e8ce5ff19e..e77243a87e1 100644
--- a/chromium/components/feature_engagement/internal/tracker_impl.cc
+++ b/chromium/components/feature_engagement/internal/tracker_impl.cc
@@ -38,7 +38,7 @@
 namespace feature_engagement {
 
 namespace {
-const char kFeatureName[] = "FeatureEngagement";
+
 const char kEventDBName[] = "EventDB";
 const char kAvailabilityDBName[] = "AvailabilityDB";
 
@@ -99,7 +99,7 @@ Tracker* Tracker::Create(
   base::FilePath event_storage_dir =
       storage_dir.AppendASCII(std::string(kEventDBName));
   auto event_db = db_provider->GetDB<Event>(
-      std::string(kFeatureName), std::string(kEventDBName), event_storage_dir,
+      leveldb_proto::ProtoDbType::FEATURE_ENGAGEMENT_EVENT, event_storage_dir,
       background_task_runner);
 
   auto event_store =
@@ -124,7 +124,7 @@ Tracker* Tracker::Create(
   base::FilePath availability_storage_dir =
       storage_dir.AppendASCII(std::string(kAvailabilityDBName));
   auto availability_db = db_provider->GetDB<Availability>(
-      std::string(kFeatureName), std::string(kAvailabilityDBName),
+      leveldb_proto::ProtoDbType::FEATURE_ENGAGEMENT_AVAILABILITY,
       availability_storage_dir, background_task_runner);
   auto availability_store_loader = base::BindOnce(
       &PersistentAvailabilityStore::LoadAndUpdateStore,
diff --git a/chromium/components/feature_engagement/internal/tracker_impl_unittest.cc b/chromium/components/feature_engagement/internal/tracker_impl_unittest.cc
index 197a10e3e3d..6c422e66289 100644
--- a/chromium/components/feature_engagement/internal/tracker_impl_unittest.cc
+++ b/chromium/components/feature_engagement/internal/tracker_impl_unittest.cc
@@ -117,7 +117,7 @@ class StoreEverythingEventStorageValidator : public EventStorageValidator {
                   uint32_t event_day,
                   uint32_t current_day) const override {
     return true;
-  };
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StoreEverythingEventStorageValidator);
@@ -129,7 +129,7 @@ class TestTimeProvider : public TimeProvider {
   ~TestTimeProvider() override = default;
 
   // TimeProvider implementation.
-  uint32_t GetCurrentDay() const override { return 1u; };
+  uint32_t GetCurrentDay() const override { return 1u; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestTimeProvider);
diff --git a/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java b/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java
index 2bb5b14efdd..11945112c62 100644
--- a/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java
+++ b/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/EventConstants.java
@@ -83,6 +83,11 @@ public final class EventConstants {
     public static final String DATA_SAVER_DETAIL_OPENED = "data_saver_overview_opened";
 
     /**
+     * The data saver milestone promo was used (tapped).
+     */
+    public static final String DATA_SAVER_MILESTONE_PROMO_OPENED = "data_saver_milestone_promo";
+
+    /**
      * The previews verbose status view was opened.
      */
     public static final String PREVIEWS_VERBOSE_STATUS_OPENED = "previews_verbose_status_opened";
@@ -93,11 +98,6 @@ public final class EventConstants {
     public static final String PREVIEWS_PAGE_LOADED = "preview_page_load";
 
     /**
-     * The download button for a media element was displayed.
-     */
-    public static final String MEDIA_DOWNLOAD_BUTTON_DISPLAYED = "media_download_button_displayed";
-
-    /**
      * Contextual Search panel was opened.
      */
     public static final String CONTEXTUAL_SEARCH_PANEL_OPENED = "contextual_search_panel_opened";
diff --git a/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java b/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java
index 8e4cd7e5ec6..b6cc8e03205 100644
--- a/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java
+++ b/chromium/components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement/FeatureConstants.java
@@ -4,74 +4,101 @@
 
 package org.chromium.components.feature_engagement;
 
+import android.support.annotation.StringDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * FeatureConstants contains the String name of all base::Feature in-product help features declared
  * in //components/feature_engagement/public/feature_constants.h.
  */
-public final class FeatureConstants {
-    public static final String DOWNLOAD_PAGE_FEATURE = "IPH_DownloadPage";
-    public static final String DOWNLOAD_PAGE_SCREENSHOT_FEATURE = "IPH_DownloadPageScreenshot";
-    public static final String DOWNLOAD_HOME_FEATURE = "IPH_DownloadHome";
-    public static final String CHROME_DUET_FEATURE = "IPH_ChromeDuet";
-    public static final String CHROME_HOME_EXPAND_FEATURE = "IPH_ChromeHomeExpand";
-    public static final String CHROME_HOME_PULL_TO_REFRESH_FEATURE = "IPH_ChromeHomePullToRefresh";
-    public static final String CONTEXTUAL_SUGGESTIONS_FEATURE = "IPH_ContextualSuggestions";
-    public static final String DATA_SAVER_PREVIEW_FEATURE = "IPH_DataSaverPreview";
-    public static final String DATA_SAVER_DETAIL_FEATURE = "IPH_DataSaverDetail";
-    public static final String NTP_BUTTON_FEATURE = "IPH_NewTabPageButton";
-    public static final String PREVIEWS_OMNIBOX_UI_FEATURE = "IPH_PreviewsOmniboxUI";
-    public static final String HOMEPAGE_TILE_FEATURE = "IPH_HomepageTile";
-
-    public static final String MEDIA_DOWNLOAD_FEATURE = "IPH_MediaDownload";
-
-    public static final String TRANSLATE_MENU_BUTTON_FEATURE = "IPH_TranslateMenuButton";
+@StringDef({FeatureConstants.DOWNLOAD_PAGE_FEATURE,
+        FeatureConstants.DOWNLOAD_PAGE_SCREENSHOT_FEATURE, FeatureConstants.DOWNLOAD_HOME_FEATURE,
+        FeatureConstants.CHROME_DUET_FEATURE, FeatureConstants.CHROME_HOME_EXPAND_FEATURE,
+        FeatureConstants.CHROME_HOME_PULL_TO_REFRESH_FEATURE,
+        FeatureConstants.CONTEXTUAL_SUGGESTIONS_FEATURE,
+        FeatureConstants.DATA_SAVER_PREVIEW_FEATURE, FeatureConstants.DATA_SAVER_DETAIL_FEATURE,
+        FeatureConstants.NTP_BUTTON_FEATURE, FeatureConstants.PREVIEWS_OMNIBOX_UI_FEATURE,
+        FeatureConstants.HOMEPAGE_TILE_FEATURE, FeatureConstants.TRANSLATE_MENU_BUTTON_FEATURE,
+        FeatureConstants.CONTEXTUAL_SEARCH_WEB_SEARCH_FEATURE,
+        FeatureConstants.CONTEXTUAL_SEARCH_PROMOTE_TAP_FEATURE,
+        FeatureConstants.CONTEXTUAL_SEARCH_PROMOTE_PANEL_OPEN_FEATURE,
+        FeatureConstants.CONTEXTUAL_SEARCH_OPT_IN_FEATURE,
+        FeatureConstants.DOWNLOAD_SETTINGS_FEATURE,
+        FeatureConstants.DOWNLOAD_INFOBAR_DOWNLOAD_CONTINUING_FEATURE,
+        FeatureConstants.DOWNLOAD_INFOBAR_DOWNLOADS_ARE_FASTER_FEATURE,
+        FeatureConstants.TAB_GROUPS_QUICKLY_COMPARE_PAGES_FEATURE,
+        FeatureConstants.TAB_GROUPS_TAP_TO_SEE_ANOTHER_TAB_FEATURE,
+        FeatureConstants.TAB_GROUPS_YOUR_TABS_ARE_TOGETHER_FEATURE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FeatureConstants {
+    String DOWNLOAD_PAGE_FEATURE = "IPH_DownloadPage";
+    String DOWNLOAD_PAGE_SCREENSHOT_FEATURE = "IPH_DownloadPageScreenshot";
+    String DOWNLOAD_HOME_FEATURE = "IPH_DownloadHome";
+    String CHROME_DUET_FEATURE = "IPH_ChromeDuet";
+    String CHROME_HOME_EXPAND_FEATURE = "IPH_ChromeHomeExpand";
+    String CHROME_HOME_PULL_TO_REFRESH_FEATURE = "IPH_ChromeHomePullToRefresh";
+    String CONTEXTUAL_SUGGESTIONS_FEATURE = "IPH_ContextualSuggestions";
+    String DATA_SAVER_PREVIEW_FEATURE = "IPH_DataSaverPreview";
+    String DATA_SAVER_DETAIL_FEATURE = "IPH_DataSaverDetail";
+    String DATA_SAVER_MILESTONE_PROMO_FEATURE = "IPH_DataSaverMilestonePromo";
+    String NTP_BUTTON_FEATURE = "IPH_NewTabPageButton";
+    String PREVIEWS_OMNIBOX_UI_FEATURE = "IPH_PreviewsOmniboxUI";
+    String HOMEPAGE_TILE_FEATURE = "IPH_HomepageTile";
+    String TRANSLATE_MENU_BUTTON_FEATURE = "IPH_TranslateMenuButton";
 
     /**
      * An IPH feature that encourages users who search a query from a web page in a new tab, to use
      * Contextual Search instead.
      */
-    public static final String CONTEXTUAL_SEARCH_WEB_SEARCH_FEATURE =
-            "IPH_ContextualSearchWebSearch";
+    String CONTEXTUAL_SEARCH_WEB_SEARCH_FEATURE = "IPH_ContextualSearchWebSearch";
 
     /**
      * An IPH feature for promoting tap over longpress for activating Contextual Search.
      */
-    public static final String CONTEXTUAL_SEARCH_PROMOTE_TAP_FEATURE =
-            "IPH_ContextualSearchPromoteTap";
+    String CONTEXTUAL_SEARCH_PROMOTE_TAP_FEATURE = "IPH_ContextualSearchPromoteTap";
 
     /**
      * An IPH feature for encouraging users to open the Contextual Search Panel.
      */
-    public static final String CONTEXTUAL_SEARCH_PROMOTE_PANEL_OPEN_FEATURE =
-            "IPH_ContextualSearchPromotePanelOpen";
+    String CONTEXTUAL_SEARCH_PROMOTE_PANEL_OPEN_FEATURE = "IPH_ContextualSearchPromotePanelOpen";
 
     /**
      * An IPH feature for encouraging users to opt-in for Contextual Search.
      */
-    public static final String CONTEXTUAL_SEARCH_OPT_IN_FEATURE = "IPH_ContextualSearchOptIn";
+    String CONTEXTUAL_SEARCH_OPT_IN_FEATURE = "IPH_ContextualSearchOptIn";
 
     /**
      * An IPH feature indicating to users that there are settings for downloads and they are
      * accessible through Downloads Home.
      */
-    public static final String DOWNLOAD_SETTINGS_FEATURE = "IPH_DownloadSettings";
+    String DOWNLOAD_SETTINGS_FEATURE = "IPH_DownloadSettings";
 
     /**
      * An IPH feature informing the users that even though infobar was closed, downloads are still
      * continuing in the background.
      */
-    public static final String DOWNLOAD_INFOBAR_DOWNLOAD_CONTINUING_FEATURE =
-            "IPH_DownloadInfoBarDownloadContinuing";
+    String DOWNLOAD_INFOBAR_DOWNLOAD_CONTINUING_FEATURE = "IPH_DownloadInfoBarDownloadContinuing";
 
     /**
      * An IPH feature that points to the download progress infobar and informs users that downloads
      * are now faster than before.
      */
-    public static final String DOWNLOAD_INFOBAR_DOWNLOADS_ARE_FASTER_FEATURE =
-            "IPH_DownloadInfoBarDownloadsAreFaster";
+    String DOWNLOAD_INFOBAR_DOWNLOADS_ARE_FASTER_FEATURE = "IPH_DownloadInfoBarDownloadsAreFaster";
+
+    /**
+     * An IPH feature to prompt the user to long press on pages with links to open them in a group.
+     */
+    String TAB_GROUPS_QUICKLY_COMPARE_PAGES_FEATURE = "IPH_TabGroupsQuicklyComparePages";
+
+    /**
+     * An IPH feature to show when the tabstrip shows to explain what each button does.
+     */
+    String TAB_GROUPS_TAP_TO_SEE_ANOTHER_TAB_FEATURE = "IPH_TabGroupsTapToSeeAnotherTab";
 
     /**
-     * Do not instantiate.
+     * An IPH feature to show on tab switcher cards with multiple tab thumbnails.
      */
-    private FeatureConstants() {}
+    String TAB_GROUPS_YOUR_TABS_ARE_TOGETHER_FEATURE = "IPH_TabGroupsYourTabsTogether";
 }
diff --git a/chromium/components/feature_engagement/public/feature_constants.cc b/chromium/components/feature_engagement/public/feature_constants.cc
index 2a70eed40b2..6748da23e6d 100644
--- a/chromium/components/feature_engagement/public/feature_constants.cc
+++ b/chromium/components/feature_engagement/public/feature_constants.cc
@@ -17,6 +17,8 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy",
 #if defined(OS_ANDROID)
 const base::Feature kIPHDataSaverDetailFeature{
     "IPH_DataSaverDetail", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kIPHDataSaverMilestonePromoFeature{
+    "IPH_DataSaverMilestonePromo", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHDataSaverPreviewFeature{
     "IPH_DataSaverPreview", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHDownloadHomeFeature{"IPH_DownloadHome",
@@ -31,8 +33,6 @@ const base::Feature kIPHChromeHomeExpandFeature{
     "IPH_ChromeHomeExpand", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHChromeHomePullToRefreshFeature{
     "IPH_ChromeHomePullToRefresh", base::FEATURE_DISABLED_BY_DEFAULT};
-const base::Feature kIPHMediaDownloadFeature{"IPH_MediaDownload",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHContextualSearchWebSearchFeature{
     "IPH_ContextualSearchWebSearch", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHContextualSearchPromoteTapFeature{
@@ -57,6 +57,12 @@ const base::Feature kIPHNewTabPageButtonFeature{
     "IPH_NewTabPageButton", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHPreviewsOmniboxUIFeature{
     "IPH_PreviewsOmniboxUI", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kIPHTabGroupsQuicklyComparePagesFeature{
+    "IPH_TabGroupsQuicklyComparePages", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kIPHTabGroupsTapToSeeAnotherTabFeature{
+    "IPH_TabGroupsTapToSeeAnotherTab", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kIPHTabGroupsYourTabsAreTogetherFeature{
+    "IPH_TabGroupsYourTabsTogether", base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kIPHTranslateMenuButtonFeature{
     "IPH_TranslateMenuButton", base::FEATURE_ENABLED_BY_DEFAULT};
 #endif  // defined(OS_ANDROID)
diff --git a/chromium/components/feature_engagement/public/feature_constants.h b/chromium/components/feature_engagement/public/feature_constants.h
index 3fa6fec9bcc..865e504d718 100644
--- a/chromium/components/feature_engagement/public/feature_constants.h
+++ b/chromium/components/feature_engagement/public/feature_constants.h
@@ -22,6 +22,7 @@ extern const base::Feature kIPHDummyFeature;
 // org.chromium.components.feature_engagement.FeatureConstants.
 #if defined(OS_ANDROID)
 extern const base::Feature kIPHDataSaverDetailFeature;
+extern const base::Feature kIPHDataSaverMilestonePromoFeature;
 extern const base::Feature kIPHDataSaverPreviewFeature;
 extern const base::Feature kIPHDownloadHomeFeature;
 extern const base::Feature kIPHDownloadPageFeature;
@@ -29,7 +30,6 @@ extern const base::Feature kIPHDownloadPageScreenshotFeature;
 extern const base::Feature kIPHChromeDuetFeature;
 extern const base::Feature kIPHChromeHomeExpandFeature;
 extern const base::Feature kIPHChromeHomePullToRefreshFeature;
-extern const base::Feature kIPHMediaDownloadFeature;
 extern const base::Feature kIPHContextualSearchWebSearchFeature;
 extern const base::Feature kIPHContextualSearchPromoteTapFeature;
 extern const base::Feature kIPHContextualSearchPromotePanelOpenFeature;
@@ -42,6 +42,9 @@ extern const base::Feature kIPHHomePageButtonFeature;
 extern const base::Feature kIPHHomepageTileFeature;
 extern const base::Feature kIPHNewTabPageButtonFeature;
 extern const base::Feature kIPHPreviewsOmniboxUIFeature;
+extern const base::Feature kIPHTabGroupsQuicklyComparePagesFeature;
+extern const base::Feature kIPHTabGroupsTapToSeeAnotherTabFeature;
+extern const base::Feature kIPHTabGroupsYourTabsAreTogetherFeature;
 extern const base::Feature kIPHTranslateMenuButtonFeature;
 #endif  // defined(OS_ANDROID)
 
diff --git a/chromium/components/feature_engagement/public/feature_list.cc b/chromium/components/feature_engagement/public/feature_list.cc
index 0d53df5cca0..5dbeefccf9b 100644
--- a/chromium/components/feature_engagement/public/feature_list.cc
+++ b/chromium/components/feature_engagement/public/feature_list.cc
@@ -18,6 +18,7 @@ const base::Feature* const kAllFeatures[] = {
     &kIPHDummyFeature,  // Ensures non-empty array for all platforms.
 #if defined(OS_ANDROID)
     &kIPHDataSaverDetailFeature,
+    &kIPHDataSaverMilestonePromoFeature,
     &kIPHDataSaverPreviewFeature,
     &kIPHDownloadHomeFeature,
     &kIPHDownloadPageFeature,
@@ -25,7 +26,6 @@ const base::Feature* const kAllFeatures[] = {
     &kIPHChromeDuetFeature,
     &kIPHChromeHomeExpandFeature,
     &kIPHChromeHomePullToRefreshFeature,
-    &kIPHMediaDownloadFeature,
     &kIPHContextualSearchWebSearchFeature,
     &kIPHContextualSearchPromoteTapFeature,
     &kIPHContextualSearchPromotePanelOpenFeature,
@@ -38,6 +38,9 @@ const base::Feature* const kAllFeatures[] = {
     &kIPHHomepageTileFeature,
     &kIPHNewTabPageButtonFeature,
     &kIPHPreviewsOmniboxUIFeature,
+    &kIPHTabGroupsQuicklyComparePagesFeature,
+    &kIPHTabGroupsTapToSeeAnotherTabFeature,
+    &kIPHTabGroupsYourTabsAreTogetherFeature,
     &kIPHTranslateMenuButtonFeature,
 #endif  // defined(OS_ANDROID)
 #if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
diff --git a/chromium/components/feature_engagement/public/feature_list.h b/chromium/components/feature_engagement/public/feature_list.h
index b444357c2e3..ae85b1a51ef 100644
--- a/chromium/components/feature_engagement/public/feature_list.h
+++ b/chromium/components/feature_engagement/public/feature_list.h
@@ -48,6 +48,8 @@ namespace {
 DEFINE_VARIATION_PARAM(kIPHDummyFeature, "IPH_Dummy");
 #if defined(OS_ANDROID)
 DEFINE_VARIATION_PARAM(kIPHDataSaverDetailFeature, "IPH_DataSaverDetail");
+DEFINE_VARIATION_PARAM(kIPHDataSaverMilestonePromoFeature,
+                       "IPH_DataSaverMilestonePromo");
 DEFINE_VARIATION_PARAM(kIPHDataSaverPreviewFeature, "IPH_DataSaverPreview");
 DEFINE_VARIATION_PARAM(kIPHDownloadHomeFeature, "IPH_DownloadHome");
 DEFINE_VARIATION_PARAM(kIPHDownloadPageFeature, "IPH_DownloadPage");
@@ -57,7 +59,6 @@ DEFINE_VARIATION_PARAM(kIPHChromeDuetFeature, "IPH_ChromeDuet");
 DEFINE_VARIATION_PARAM(kIPHChromeHomeExpandFeature, "IPH_ChromeHomeExpand");
 DEFINE_VARIATION_PARAM(kIPHChromeHomePullToRefreshFeature,
                        "IPH_ChromeHomePullToRefresh");
-DEFINE_VARIATION_PARAM(kIPHMediaDownloadFeature, "IPH_MediaDownload");
 DEFINE_VARIATION_PARAM(kIPHContextualSearchWebSearchFeature,
                        "IPH_ContextualSearchWebSearch");
 DEFINE_VARIATION_PARAM(kIPHContextualSearchPromoteTapFeature,
@@ -77,6 +78,12 @@ DEFINE_VARIATION_PARAM(kIPHHomePageButtonFeature, "IPH_HomePageButton");
 DEFINE_VARIATION_PARAM(kIPHHomepageTileFeature, "IPH_HomepageTile");
 DEFINE_VARIATION_PARAM(kIPHNewTabPageButtonFeature, "IPH_NewTabPageButton");
 DEFINE_VARIATION_PARAM(kIPHPreviewsOmniboxUIFeature, "IPH_PreviewsOmniboxUI");
+DEFINE_VARIATION_PARAM(kIPHTabGroupsQuicklyComparePagesFeature,
+                       "IPH_TabGroupsQuicklyComparePages");
+DEFINE_VARIATION_PARAM(kIPHTabGroupsTapToSeeAnotherTabFeature,
+                       "IPH_TabGroupsTapToSeeAnotherTab");
+DEFINE_VARIATION_PARAM(kIPHTabGroupsYourTabsAreTogetherFeature,
+                       "IPH_TabGroupsYourTabsTogether");
 DEFINE_VARIATION_PARAM(kIPHTranslateMenuButtonFeature,
                        "IPH_TranslateMenuButton");
 #endif  // defined(OS_ANDROID)
@@ -104,6 +111,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
     kIPHDemoModeChoiceVariations[] = {
 #if defined(OS_ANDROID)
         VARIATION_ENTRY(kIPHDataSaverDetailFeature),
+        VARIATION_ENTRY(kIPHDataSaverMilestonePromoFeature),
         VARIATION_ENTRY(kIPHDataSaverPreviewFeature),
         VARIATION_ENTRY(kIPHDownloadHomeFeature),
         VARIATION_ENTRY(kIPHDownloadPageFeature),
@@ -111,7 +119,6 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
         VARIATION_ENTRY(kIPHChromeDuetFeature),
         VARIATION_ENTRY(kIPHChromeHomeExpandFeature),
         VARIATION_ENTRY(kIPHChromeHomePullToRefreshFeature),
-        VARIATION_ENTRY(kIPHMediaDownloadFeature),
         VARIATION_ENTRY(kIPHContextualSearchWebSearchFeature),
         VARIATION_ENTRY(kIPHContextualSearchPromoteTapFeature),
         VARIATION_ENTRY(kIPHContextualSearchPromotePanelOpenFeature),
@@ -124,6 +131,9 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
         VARIATION_ENTRY(kIPHHomepageTileFeature),
         VARIATION_ENTRY(kIPHNewTabPageButtonFeature),
         VARIATION_ENTRY(kIPHPreviewsOmniboxUIFeature),
+        VARIATION_ENTRY(kIPHTabGroupsQuicklyComparePagesFeature),
+        VARIATION_ENTRY(kIPHTabGroupsTapToSeeAnotherTabFeature),
+        VARIATION_ENTRY(kIPHTabGroupsYourTabsAreTogetherFeature),
         VARIATION_ENTRY(kIPHTranslateMenuButtonFeature),
 #elif BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
         VARIATION_ENTRY(kIPHBookmarkFeature),