[AF] Renames the flag that controls GPay branding in CC upstream infobar

Renames the existing flag, kAutofillUpstreamUseGooglePayOnAndroidBranding,
to kAutofillUpstreamUseGooglePayBrandingOnMobile as it also controls GPay
branding in iOS.

Adds an entry to the about flags page in iOS in order to control the flag.

Bug:841758

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I40d961f0106e14f37c5091ffbda7ac72620dd43c
Reviewed-on: https://chromium-review.googlesource.com/1053430
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557573}

chrome/browser/about_flags.cc

@@ -2912,7 +2912,7 @@ const FeatureEntry kFeatureEntries[] = {
          kEnableAutofillCreditCardUploadGooglePayOnAndroidBrandingDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(
-         autofill::features::kAutofillUpstreamUseGooglePayOnAndroidBranding)},
+         autofill::features::kAutofillUpstreamUseGooglePayBrandingOnMobile)},
     {"enable-autofill-credit-card-upload-send-detected-values",
      flag_descriptions::kEnableAutofillCreditCardUploadSendDetectedValuesName,
      flag_descriptions::

components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.cc

@@ -85,7 +85,7 @@ bool AutofillSaveCardInfoBarDelegateMobile::LegalMessagesParsedSuccessfully() {
 bool AutofillSaveCardInfoBarDelegateMobile::IsGooglePayBrandingEnabled() const {
   return upload_ &&
          base::FeatureList::IsEnabled(
-             features::kAutofillUpstreamUseGooglePayOnAndroidBranding);
+             features::kAutofillUpstreamUseGooglePayBrandingOnMobile);
 }
 
 base::string16 AutofillSaveCardInfoBarDelegateMobile::GetTitleText() const {

components/autofill/core/common/autofill_features.cc

@@ -56,8 +56,8 @@ const base::Feature kAutofillSkipComparingInferredLabels{
     "AutofillSkipComparingInferredLabels", base::FEATURE_DISABLED_BY_DEFAULT};
 
 // Controls whether the credit card upload bubble shows the Google Pay logo and
-// a shorter "Save card?" header message on Android.
-const base::Feature kAutofillUpstreamUseGooglePayOnAndroidBranding{
+// a shorter "Save card?" header message on mobile.
+const base::Feature kAutofillUpstreamUseGooglePayBrandingOnMobile{
     "AutofillUpstreamUseGooglePayOnAndroidBranding",
     base::FEATURE_DISABLED_BY_DEFAULT};
 

components/autofill/core/common/autofill_features.h

@@ -20,7 +20,7 @@ extern const base::Feature kAutofillEnforceMinRequiredFieldsForUpload;
 extern const base::Feature kAutofillRestrictUnownedFieldsToFormlessCheckout;
 extern const base::Feature kAutofillShowTypePredictions;
 extern const base::Feature kAutofillSkipComparingInferredLabels;
-extern const base::Feature kAutofillUpstreamUseGooglePayOnAndroidBranding;
+extern const base::Feature kAutofillUpstreamUseGooglePayBrandingOnMobile;
 
 }  // namespace features
 }  // namespace autofill

ios/chrome/browser/about_flags.mm

@@ -216,6 +216,13 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kWKHTTPSystemCookieStoreName,
      flag_descriptions::kWKHTTPSystemCookieStoreName, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(web::features::kWKHTTPSystemCookieStore)},
+    {"enable-autofill-credit-card-upload-google-pay-branding",
+     flag_descriptions::kAutofillUpstreamUseGooglePayBrandingOnMobileName,
+     flag_descriptions::
+         kAutofillUpstreamUseGooglePayBrandingOnMobileDescription,
+     flags_ui::kOsIos,
+     FEATURE_VALUE_TYPE(
+         autofill::features::kAutofillUpstreamUseGooglePayBrandingOnMobile)},
     {"show-autofill-type-predictions",
      flag_descriptions::kShowAutofillTypePredictionsName,
      flag_descriptions::kShowAutofillTypePredictionsDescription,

ios/chrome/browser/ios_chrome_flag_descriptions.cc

@@ -11,6 +11,12 @@
 
 namespace flag_descriptions {
 
+const char kAutofillUpstreamUseGooglePayBrandingOnMobileName[] =
+    "Enable Google Pay branding when offering credit card upload";
+const char kAutofillUpstreamUseGooglePayBrandingOnMobileDescription[] =
+    "If enabled, shows the Google Pay logo and a shorter header message when "
+    "credit card upload to Google Payments is offered.";
+
 const char kAutofillIOSDelayBetweenFieldsName[] = "Autofill delay";
 const char kAutofillIOSDelayBetweenFieldsDescription[] =
     "Delay between the different fields of a form being autofilled. In "

ios/chrome/browser/ios_chrome_flag_descriptions.h

@@ -7,11 +7,16 @@
 
 namespace flag_descriptions {
 
-// Title and description for the flag to controll the autofill delay.
+// Title and description for the flag to control GPay branding in credit card
+// upstream infobar.
+extern const char kAutofillUpstreamUseGooglePayBrandingOnMobileName[];
+extern const char kAutofillUpstreamUseGooglePayBrandingOnMobileDescription[];
+
+// Title and description for the flag to control the autofill delay.
 extern const char kAutofillIOSDelayBetweenFieldsName[];
 extern const char kAutofillIOSDelayBetweenFieldsDescription[];
 
-// Title and description for the flag to controll the dynamic autofill.
+// Title and description for the flag to control the dynamic autofill.
 extern const char kAutofillDynamicFormsName[];
 extern const char kAutofillDynamicFormsDescription[];