[AF][Upstream String] Add separate "No thanks" button label for autofill payments UI

Add a No thanks used only by Payments Autofill. So when we want to override strings
with Finch overrides no other usages will be affected.

Bug: 961082
Change-Id: I85519146a5b4b3b88c65065e2378aba15c6e6971
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1610308Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Jared Saul <jsaul@google.com>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664855}

chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc

@@ -330,11 +330,13 @@ base::string16 SaveCardBubbleControllerImpl::GetExplanatoryMessage() const {
 base::string16 SaveCardBubbleControllerImpl::GetAcceptButtonText() const {
   switch (current_bubble_type_) {
     case BubbleType::LOCAL_SAVE:
-      return l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT);
+      return l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_SAVE_CARD_BUBBLE_LOCAL_SAVE_ACCEPT);
     case BubbleType::UPLOAD_SAVE: {
       if (!base::FeatureList::IsEnabled(
               features::kAutofillSaveCardImprovedUserConsent)) {
-        return l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT);
+        return l10n_util::GetStringUTF16(
+            IDS_AUTOFILL_SAVE_CARD_BUBBLE_UPLOAD_SAVE_ACCEPT);
       }
       std::string param = base::GetFieldTrialParamValueByFeature(
           features::kAutofillSaveCreditCardUsesImprovedMessaging,
@@ -360,7 +362,8 @@ base::string16 SaveCardBubbleControllerImpl::GetAcceptButtonText() const {
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT_COPY_TEST_CONFIRM_AND_SAVE);
       }
-      return l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT);
+      return l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_SAVE_CARD_BUBBLE_UPLOAD_SAVE_ACCEPT);
     }
     case BubbleType::MANAGE_CARDS:
       return l10n_util::GetStringUTF16(IDS_AUTOFILL_DONE);
@@ -375,7 +378,8 @@ base::string16 SaveCardBubbleControllerImpl::GetAcceptButtonText() const {
 base::string16 SaveCardBubbleControllerImpl::GetDeclineButtonText() const {
   switch (current_bubble_type_) {
     case BubbleType::LOCAL_SAVE:
-      return l10n_util::GetStringUTF16(IDS_NO_THANKS);
+      return l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_NO_THANKS_DESKTOP_LOCAL_SAVE);
     case BubbleType::UPLOAD_SAVE: {
       // There is no decline button when experiment is off.
       DCHECK(base::FeatureList::IsEnabled(
@@ -398,7 +402,8 @@ base::string16 SaveCardBubbleControllerImpl::GetDeclineButtonText() const {
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_SAVE_CARD_PROMPT_DECLINE_COPY_TEST_ADD);
       }
-      return l10n_util::GetStringUTF16(IDS_NO_THANKS);
+      return l10n_util::GetStringUTF16(
+          IDS_AUTOFILL_NO_THANKS_DESKTOP_UPLOAD_SAVE);
     }
     case BubbleType::MANAGE_CARDS:
     case BubbleType::SIGN_IN_PROMO:

chrome/browser/ui/views/autofill/payments/local_card_migration_bubble_views.cc

@@ -88,10 +88,9 @@ int LocalCardMigrationBubbleViews::GetDialogButtons() const {
 
 base::string16 LocalCardMigrationBubbleViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
+  DCHECK_EQ(button, ui::DIALOG_BUTTON_OK);
   return l10n_util::GetStringUTF16(
-      button == ui::DIALOG_BUTTON_OK
-          ? IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BUTTON_LABEL
-          : IDS_NO_THANKS);
+      IDS_AUTOFILL_LOCAL_CARD_MIGRATION_BUBBLE_BUTTON_LABEL);
 }
 
 gfx::Size LocalCardMigrationBubbleViews::CalculatePreferredSize() const {

components/autofill/core/browser/payments/autofill_credit_card_filling_infobar_delegate_mobile.cc

@@ -82,7 +82,7 @@ base::string16 AutofillCreditCardFillingInfoBarDelegateMobile::GetButtonLabel(
     InfoBarButton button) const {
   return l10n_util::GetStringUTF16(
       button == BUTTON_OK ? IDS_AUTOFILL_CREDIT_CARD_FILLING_INFOBAR_ACCEPT
-                          : IDS_NO_THANKS);
+                          : IDS_AUTOFILL_CREDIT_CARD_FILLING_INFOBAR_NO_THANKS);
 }
 
 void AutofillCreditCardFillingInfoBarDelegateMobile::LogUserAction(

components/autofill/core/browser/payments/autofill_save_card_infobar_delegate_mobile.cc

@@ -161,7 +161,7 @@ base::string16 AutofillSaveCardInfoBarDelegateMobile::GetButtonLabel(
   return options_.should_request_name_from_user ||
                  options_.should_request_expiration_date_from_user
              ? l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_CONTINUE)
-             : l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT);
+             : l10n_util::GetStringUTF16(IDS_AUTOFILL_SAVE_CARD_INFOBAR_ACCEPT);
 }
 
 bool AutofillSaveCardInfoBarDelegateMobile::Accept() {

components/autofill_payments_strings.grdp

@@ -68,10 +68,6 @@
   </if>
 
   <!-- Autofill save credit card bubble or infobar prompt -->
-  <!--TODO(crbug.com/961082): Remove this once the separate label is in use. -->
-  <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT" desc="Text to show for the Autofill save credit card prompt accept button. The prompt can be either a bubble or an infobar.">
-    Save
-  </message>
   <if expr="is_android or is_ios">
     <then>
       <message name="IDS_AUTOFILL_SAVE_CARD_INFOBAR_ACCEPT" desc="Text to show for the Autofill save credit card infobar accept button.">

ios/chrome/browser/ui/autofill/save_card_infobar_egtest.mm

@@ -78,7 +78,7 @@ id<GREYMatcher> closeButtonMatcher() {
 
 id<GREYMatcher> saveButtonMatcher() {
   return chrome_test_util::ButtonWithAccessibilityLabelId(
-      IDS_AUTOFILL_SAVE_CARD_PROMPT_ACCEPT);
+      IDS_AUTOFILL_SAVE_CARD_INFOBAR_ACCEPT);
 }
 
 }  // namepsace