[AF][Upstream UI] Add No thanks button to save card offer bubbles on Chrome OS.

Use the same flag which controls android UI.

Bug: 980716
Change-Id: Ief150b48c3894682bbb64cbf50b0689c83a02179
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1709165Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Jared Saul <jsaul@google.com>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680619}

chrome/browser/about_flags.cc

@@ -4150,7 +4150,8 @@ const FeatureEntry kFeatureEntries[] = {
 
     {"enable-autofill-save-card-show-no-thanks",
      flag_descriptions::kEnableAutofillSaveCardShowNoThanksName,
-     flag_descriptions::kEnableAutofillSaveCardShowNoThanksDescription, kOsAll,
+     flag_descriptions::kEnableAutofillSaveCardShowNoThanksDescription,
+     kOsCrOS | kOsAndroid,
      FEATURE_VALUE_TYPE(autofill::features::kAutofillSaveCardShowNoThanks)},
 
 #if defined(OS_ANDROID)

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

@@ -1162,12 +1162,27 @@ IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
 // [No thanks] button (it has an [X] Close button instead.)
 IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
                        Local_ShouldNotHaveNoThanksButton) {
+  scoped_feature_list_.InitAndDisableFeature(
+      features::kAutofillSaveCardShowNoThanks);
   FillForm();
   SubmitFormAndWaitForCardLocalSaveBubble();
 
   // Assert that the cancel button cannot be found.
   EXPECT_FALSE(FindViewInBubbleById(DialogViewId::CANCEL_BUTTON));
 }
+
+// Tests the local save bubble. Ensures that the bubble has a
+// [No thanks] button if |kAutofillSaveCardShowNoThanks| experiment is enabled.
+IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
+                       Local_ShouldHaveNoThanksButtonIfExperimentEnabled) {
+  scoped_feature_list_.InitAndEnableFeature(
+      features::kAutofillSaveCardShowNoThanks);
+  FillForm();
+  SubmitFormAndWaitForCardLocalSaveBubble();
+
+  // Assert that the cancel button can be found.
+  EXPECT_TRUE(FindViewInBubbleById(DialogViewId::CANCEL_BUTTON));
+}
 #endif
 
 // Tests the local save bubble. Ensures that the bubble behaves correctly if
@@ -1387,7 +1402,11 @@ IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
 // [No thanks] button (it has an [X] Close button instead.)
 IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
                        Upload_ShouldNotHaveNoThanksButton) {
-  scoped_feature_list_.InitAndEnableFeature(features::kAutofillUpstream);
+  scoped_feature_list_.InitWithFeatures(
+      // Enabled
+      {features::kAutofillUpstream},
+      // Disabled
+      {features::kAutofillSaveCardShowNoThanks});
 
   // Start sync.
   harness_->SetupSync();
@@ -1398,6 +1417,26 @@ IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
   // Assert that the cancel button cannot be found.
   EXPECT_FALSE(FindViewInBubbleById(DialogViewId::CANCEL_BUTTON));
 }
+
+// Tests the upload save bubble. Ensures that the bubble has a
+// [No thanks] button if |kAutofillSaveCardShowNoThanks| experiment is enabled.
+IN_PROC_BROWSER_TEST_F(SaveCardBubbleViewsFullFormBrowserTest,
+                       Upload_ShouldHaveNoThanksButtonIfExperimentEnabled) {
+  scoped_feature_list_.InitWithFeatures(
+      // Enabled
+      {features::kAutofillSaveCardShowNoThanks, features::kAutofillUpstream},
+      // Disabled
+      {});
+
+  // Start sync.
+  harness_->SetupSync();
+
+  FillForm();
+  SubmitFormAndWaitForCardUploadSaveBubble();
+
+  // Assert that the cancel button can be found.
+  EXPECT_TRUE(FindViewInBubbleById(DialogViewId::CANCEL_BUTTON));
+}
 #endif  // defined(OS_CHROMEOS)
 
 // Tests the upload save bubble. Ensures that clicking the top-right [X] close

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

@@ -111,9 +111,10 @@ bool SaveCardOfferBubbleViews::Accept() {
 }
 
 int SaveCardOfferBubbleViews::GetDialogButtons() const {
-  if (features::ShouldShowImprovedUserConsentForCreditCardSave())
+  if (features::ShouldShowImprovedUserConsentForCreditCardSave() ||
+      base::FeatureList::IsEnabled(features::kAutofillSaveCardShowNoThanks)) {
     return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
-
+  }
   return ui::DIALOG_BUTTON_OK;
 }