Fixed broken tests due to expired credit cards

UserHappinessFormInteraction_CreditCardForm and
LogCreditCardSeamlessFillsMetricIfAutofilledWithoutCvc were broken
due to a credit card expiring in 12/2022.

Fixed: 1394998
Change-Id: I082c64e40f6145f3a3c4373007d5cd27175ea28f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4066885
Reviewed-by: Florian Leimgruber <fleimgruber@google.com>
Commit-Queue: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1077999}

components/autofill/core/browser/metrics/autofill_metrics_test_base.cc

@@ -209,9 +209,7 @@ void AutofillMetricsBaseTest::RecreateCreditCards(
     bool masked_card_is_enrolled_for_virtual_card) {
   personal_data().ClearCreditCards();
   if (include_local_credit_card) {
-    CreditCard local_credit_card;
-    test::SetCreditCardInfo(&local_credit_card, "Test User",
-                            "4111111111111111" /* Visa */, "11", "2022", "1");
+    CreditCard local_credit_card = test::GetCreditCard();
     local_credit_card.set_guid("10000000-0000-0000-0000-000000000001");
     personal_data().AddCreditCard(local_credit_card);
   }
@@ -244,10 +242,8 @@ std::string AutofillMetricsBaseTest::CreateLocalMasterCard(
     personal_data().ClearCreditCards();
   }
   std::string guid("10000000-0000-0000-0000-000000000003");
-  CreditCard local_credit_card;
-  test::SetCreditCardInfo(&local_credit_card, "Test User",
-                          "5454545454545454" /* Mastercard */, "08", "2022",
-                          "1");
+  CreditCard local_credit_card = test::GetCreditCard();
+  local_credit_card.SetNumber(u"5454545454545454" /* Mastercard */);
   local_credit_card.set_guid(guid);
   personal_data().AddCreditCard(local_credit_card);
   return guid;
@@ -258,20 +254,17 @@ AutofillMetricsBaseTest::CreateLocalAndDuplicateServerCreditCard() {
   personal_data().ClearCreditCards();
 
   // Local credit card creation.
-  CreditCard local_credit_card;
-  test::SetCreditCardInfo(&local_credit_card, "Test User",
-                          "4111111111111111" /* Visa */, "11", "2022", "1");
+  CreditCard local_credit_card = test::GetCreditCard();
   std::string local_card_guid("10000000-0000-0000-0000-000000000001");
   local_credit_card.set_guid(local_card_guid);
   personal_data().AddCreditCard(local_credit_card);
 
   // Duplicate masked server card with same card information as local card.
-  CreditCard masked_server_credit_card(CreditCard::MASKED_SERVER_CARD,
-                                       "server_id_2");
+  CreditCard masked_server_credit_card = test::GetCreditCard();
+  masked_server_credit_card.set_record_type(CreditCard::MASKED_SERVER_CARD);
+  masked_server_credit_card.set_server_id("server_id_2");
   std::string server_card_guid("10000000-0000-0000-0000-000000000002");
   masked_server_credit_card.set_guid(server_card_guid);
-  test::SetCreditCardInfo(&masked_server_credit_card, "Test User",
-                          "4111111111111111" /* Visa */, "11", "2022", "1");
   masked_server_credit_card.set_instrument_id(1);
   masked_server_credit_card.SetNetworkForMaskedCard(kVisaCard);
   masked_server_credit_card.SetNumber(u"1111");

components/autofill/core/browser/metrics/autofill_metrics_unittest.cc

@@ -7442,9 +7442,7 @@ TEST_F(AutofillMetricsTest, UserHappinessFormInteraction_EmptyForm) {
 
 // Verify that we correctly log user happiness metrics dealing with form
 // interaction.
-// TODO(crbug.com/1394998): Re-enable this test
-TEST_F(AutofillMetricsTest,
-       DISABLED_UserHappinessFormInteraction_CreditCardForm) {
+TEST_F(AutofillMetricsTest, UserHappinessFormInteraction_CreditCardForm) {
   RecreateCreditCards(/*include_local_credit_card=*/true,
                       /*include_masked_server_credit_card=*/false,
                       /*include_full_server_credit_card=*/false,
@@ -10340,9 +10338,8 @@ TEST_F(AutofillMetricsSeamlessnessTest,
 }
 
 // Tests that Autofill.CreditCard.SeamlessFills.* are emitted.
-// TODO(crbug.com/1394998): Re-enable this test
 TEST_F(AutofillMetricsSeamlessnessTest,
-       DISABLED_LogCreditCardSeamlessFillsMetricIfAutofilledWithoutCvc) {
+       LogCreditCardSeamlessFillsMetricIfAutofilledWithoutCvc) {
   using Metric = AutofillMetrics::CreditCardSeamlessness::Metric;
   using UkmBuilder = ukm::builders::Autofill_CreditCardFill;