Add billing address as a mandatory field of Payments credit cards.

components/autofill/core/browser/autofill_test_utils.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/autofill_test_utils.h"
 
 #include <string>
 
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 209 matching lines @@
 
 AutofillProfile GetVerifiedProfile2() {
   AutofillProfile profile(GetFullProfile2());
   profile.set_origin(kSettingsOrigin);
   return profile;
 }
 
 CreditCard GetCreditCard() {
   CreditCard credit_card(base::GenerateGUID(), "http://www.example.com");
   SetCreditCardInfo(&credit_card, "Test User", "4111111111111111" /* Visa */,
-                    "11", "2022");
+                    "11", "2022", "1");
   return credit_card;
 }
 
 CreditCard GetCreditCard2() {
   CreditCard credit_card(base::GenerateGUID(), "https://www.example.com");
   SetCreditCardInfo(&credit_card, "Someone Else", "378282246310005" /* AmEx */,
-                    "07", "2022");
+                    "07", "2022", "1");
   return credit_card;
 }
 
 CreditCard GetVerifiedCreditCard() {
   CreditCard credit_card(GetCreditCard());
   credit_card.set_origin(kSettingsOrigin);
   return credit_card;
 }
 
 CreditCard GetVerifiedCreditCard2() {
   CreditCard credit_card(GetCreditCard2());
   credit_card.set_origin(kSettingsOrigin);
   return credit_card;
 }
 
 CreditCard GetMaskedServerCard() {
   CreditCard credit_card(CreditCard::MASKED_SERVER_CARD, "a123");
   test::SetCreditCardInfo(&credit_card, "Bonnie Parker",
-                          "2109" /* Mastercard */, "12", "2020");
+                          "2109" /* Mastercard */, "12", "2020", "1");
   credit_card.SetNetworkForMaskedCard(kMasterCard);
   return credit_card;
 }
 
 CreditCard GetMaskedServerCardAmex() {
   CreditCard credit_card(CreditCard::MASKED_SERVER_CARD, "b456");
-  test::SetCreditCardInfo(&credit_card, "Justin Thyme",
-                          "8431" /* Amex */, "9", "2020");
+  test::SetCreditCardInfo(&credit_card, "Justin Thyme", "8431" /* Amex */, "9",
+                          "2020", "1");
   credit_card.SetNetworkForMaskedCard(kAmericanExpressCard);
   return credit_card;
 }
 
 void SetProfileInfo(AutofillProfile* profile,
     const char* first_name, const char* middle_name,
     const char* last_name, const char* email, const char* company,
     const char* address1, const char* address2, const char* city,
     const char* state, const char* zipcode, const char* country,
     const char* phone) {
@@ skipping 18 matching lines @@
     const char* state, const char* zipcode, const char* country,
     const char* phone) {
   if (guid)
     profile->set_guid(guid);
   SetProfileInfo(profile, first_name, middle_name, last_name, email,
                  company, address1, address2, city, state, zipcode, country,
                  phone);
 }
 
 void SetCreditCardInfo(CreditCard* credit_card,
-    const char* name_on_card, const char* card_number,
-    const char* expiration_month, const char* expiration_year) {
+                       const char* name_on_card,
+                       const char* card_number,
+                       const char* expiration_month,
+                       const char* expiration_year,
+                       const std::string& billing_address_id) {
   check_and_set(credit_card, CREDIT_CARD_NAME_FULL, name_on_card);
   check_and_set(credit_card, CREDIT_CARD_NUMBER, card_number);
   check_and_set(credit_card, CREDIT_CARD_EXP_MONTH, expiration_month);
   check_and_set(credit_card, CREDIT_CARD_EXP_4_DIGIT_YEAR, expiration_year);
+  credit_card->set_billing_address_id(billing_address_id);
 }
 
 void DisableSystemServices(PrefService* prefs) {
   // Use a mock Keychain rather than the OS one to store credit card data.
   OSCryptMocker::SetUpWithSingleton();
 }
 
 void ReenableSystemServices() {
   OSCryptMocker::TearDown();
 }
@@ skipping 38 matching lines @@
                     const char* control_type) {
   field->set_signature(signature);
   if (name)
     field->set_name(name);
   if (control_type)
     field->set_type(control_type);
 }
 
 }  // namespace test
 }  // namespace autofill