[iOS] Add experiment feature flag kRestoreGaiaCookiesOnUserAction.

Bug: 1157475
Change-Id: Ifa0d6e112be23a489e2a5cc73b483e52308396d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584028Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836085}

chrome/browser/flag-metadata.json

@@ -4181,6 +4181,11 @@
     "owners": [ "fernandex", "chrome-signin-team" ],
     "expiry_milestone": 96
   },
+  {
+    "name": "restore-gaia-cookies-on-user-action",
+    "owners": ["fernandex", "chrome-signin-team" ],
+    "expiry_milestone": 96
+  },
   {
     "name": "restrict-gamepad-access",
     "owners": [ "//device/gamepad/OWNERS", "jameshollyer@chromium.org" ],

components/signin/ios/browser/features.cc

@@ -16,6 +16,9 @@ bool ForceStartupSigninPromo() {
 const base::Feature kRestoreGaiaCookiesIfDeleted{
     "RestoreGAIACookiesIfDeleted", base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kRestoreGaiaCookiesOnUserAction{
+    "RestoreGAIACookiesOnUserAction", base::FEATURE_DISABLED_BY_DEFAULT};
+
 const char kDelayThresholdMinutesToUpdateGaiaCookie[] =
     "minutes-delay-to-restore-gaia-cookies-if-deleted";
 

components/signin/ios/browser/features.h

@@ -18,6 +18,10 @@ bool ForceStartupSigninPromo();
 // Feature controlling whether to restore GAIA cookies if they are deleted.
 extern const base::Feature kRestoreGaiaCookiesIfDeleted;
 
+// Feature controlling whether to restore GAIA cookies when the user explicitly
+// requests to sign in to a Google service.
+extern const base::Feature kRestoreGaiaCookiesOnUserAction;
+
 // Name of multi-value switch that controls the delay (in minutes) for polling
 // for the existence of Gaia cookies for google.com.
 extern const char kDelayThresholdMinutesToUpdateGaiaCookie[];

ios/chrome/browser/flags/about_flags.mm

@@ -556,6 +556,11 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kRestoreGaiaCookiesIfDeletedDescription,
      flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(signin::kRestoreGaiaCookiesIfDeleted)},
+    {"restore-gaia-cookies-on-user-action",
+     flag_descriptions::kRestoreGaiaCookiesOnUserActionName,
+     flag_descriptions::kRestoreGaiaCookiesOnUserActionDescription,
+     flags_ui::kOsIos,
+     FEATURE_VALUE_TYPE(signin::kRestoreGaiaCookiesOnUserAction)},
     {"use-username-for-signin-notification-infobar-title",
      flag_descriptions::kSigninNotificationInfobarUsernameInTitleName,
      flag_descriptions::kSigninNotificationInfobarUsernameInTitleDescription,

ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc

@@ -351,6 +351,12 @@ const char kRestoreGaiaCookiesIfDeletedDescription[] =
     "When enabled, will restore GAIA cookies for signed-in Chrome users if "
     "they are deleted.";
 
+const char kRestoreGaiaCookiesOnUserActionName[] =
+    "Restore GAIA cookies on user action";
+const char kRestoreGaiaCookiesOnUserActionDescription[] =
+    "When enabled, will restore GAIA cookies for signed-in Chrome users if "
+    "the user explicitly requests a Google service.";
+
 const char kSafeBrowsingAvailableName[] = "Make Safe Browsing available";
 const char kSafeBrowsingAvailableDescription[] =
     "When enabled, navigation URLs are compared to Safe Browsing blocklists, "

ios/chrome/browser/flags/ios_chrome_flag_descriptions.h

@@ -409,9 +409,16 @@ extern const char kWebPageAlternativeTextZoomDescription[];
 extern const char kWebViewNativeContextMenuName[];
 extern const char kWebViewNativeContextMenuDescription[];
 
+// Title and description for the flag to restore Gaia cookies as soon as Chrome
+// detects that they have been removed.
 extern const char kRestoreGaiaCookiesIfDeletedName[];
 extern const char kRestoreGaiaCookiesIfDeletedDescription[];
 
+// Title and description for the flag to restore Gaia cookies when the user
+// explicitly requests to be signed in to a Google service.
+extern const char kRestoreGaiaCookiesOnUserActionName[];
+extern const char kRestoreGaiaCookiesOnUserActionDescription[];
+
 extern const char kRecordSnapshotSizeName[];
 extern const char kRecordSnapshotSizeDescription[];