[Payments] Normalize billing address for response on Desktop.

components/payments/core/payment_request_data_util.cc

 // Copyright 2017 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/payments/core/payment_request_data_util.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 53 matching lines @@
   address.recipient =
       profile.GetInfo(autofill::AutofillType(autofill::NAME_FULL), app_locale);
   address.phone = profile.GetRawInfo(autofill::PHONE_HOME_WHOLE_NUMBER);
 
   return address;
 }
 
 BasicCardResponse GetBasicCardResponseFromAutofillCreditCard(
     const autofill::CreditCard& card,
     const base::string16& cvc,
-    const std::vector<autofill::AutofillProfile*>& billing_profiles,
+    const autofill::AutofillProfile& billing_profile,
     const std::string& app_locale) {
   BasicCardResponse response;
   response.cardholder_name = card.GetRawInfo(autofill::CREDIT_CARD_NAME_FULL);
   response.card_number = card.GetRawInfo(autofill::CREDIT_CARD_NUMBER);
   response.expiry_month = card.GetRawInfo(autofill::CREDIT_CARD_EXP_MONTH);
   response.expiry_year =
       card.GetRawInfo(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
   response.card_security_code = cvc;
 
-  // TODO(crbug.com/602666): Ensure we reach here only if the card has a billing
-  // address. Then add DCHECK(!card->billing_address_id().empty()).
+  response.billing_address =
+      GetPaymentAddressFromAutofillProfile(billing_profile, app_locale);
+
+  return response;
+}
+
+BasicCardResponse GetBasicCardResponseFromAutofillCreditCard(
+    const autofill::CreditCard& card,
+    const base::string16& cvc,
+    const std::vector<autofill::AutofillProfile*>& billing_profiles,
+    const std::string& app_locale) {
+  autofill::AutofillProfile billing_profile;
+
+  // TODO(crbug.com/714655): This should be done in the autofill instrument.
   if (!card.billing_address_id().empty()) {
     const autofill::AutofillProfile* billing_address =
         autofill::PersonalDataManager::GetProfileFromProfilesByGUID(
             card.billing_address_id(), billing_profiles);
     DCHECK(billing_address);
-    response.billing_address =
-        GetPaymentAddressFromAutofillProfile(*billing_address, app_locale);
+    billing_profile = *billing_address;
   }
 
-  return response;
+  return GetBasicCardResponseFromAutofillCreditCard(card, cvc, billing_profile,
+                                                    app_locale);
 }
 
 void ParseBasicCardSupportedNetworks(
     const std::vector<PaymentMethodData>& method_data,
     std::vector<std::string>* out_supported_networks,
     std::set<std::string>* out_basic_card_specified_networks) {
   DCHECK(out_supported_networks->empty());
   DCHECK(out_basic_card_specified_networks->empty());
 
   std::set<std::string> card_networks{"amex",     "diners",     "discover",
@@ skipping 56 matching lines @@
 }
 
 std::string FormatPhoneForResponse(const std::string& phone_number,
                                    const std::string& country_code) {
   return FormatPhoneNumber(phone_number, country_code,
                            PhoneNumberUtil::PhoneNumberFormat::E164);
 }
 
 }  // namespace data_util
 }  // namespace payments