[Payments] Normalize billing address for response on Desktop.

components/payments/core/payment_request_data_util.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CORE_PAYMENT_REQUEST_DATA_UTIL_H_
 #define COMPONENTS_PAYMENTS_CORE_PAYMENT_REQUEST_DATA_UTIL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 // profile.
 PaymentAddress GetPaymentAddressFromAutofillProfile(
     const autofill::AutofillProfile& profile,
     const std::string& app_locale);
 
 // Helper function to get an instance of web::BasicCardResponse from an autofill
 // credit card.
 BasicCardResponse GetBasicCardResponseFromAutofillCreditCard(
     const autofill::CreditCard& card,
     const base::string16& cvc,
+    const autofill::AutofillProfile& billing_profile,
+    const std::string& app_locale);
+// TODO(crbug.com/714655): Once the billing address is checked in the instrument

[Mathieu, 2017/04/24 19:42:09]

not sure I like this fork very much. can you move the code that gets the billing
 address to be used on iOS too? 

Or perhaps the ideal state is for AutofillPaymentInstrument to be used on iOS,
but that's a bigger change.

[sebsg, 2017/04/25 17:36:44]

Done.

+// on iOS, remove this.
+BasicCardResponse GetBasicCardResponseFromAutofillCreditCard(
+    const autofill::CreditCard& card,
+    const base::string16& cvc,
     const std::vector<autofill::AutofillProfile*>& billing_profiles,
     const std::string& app_locale);
 
 // Parse the supported card networks from supportedMethods and  "basic-card"'s
 // supportedNetworks. |out_supported_networks| is filled with list of networks
 // in the order that they were specified by the merchant.
 // |out_basic_card_supported_networks| is a subset of |out_supported_networks|
 // that includes all networks that were specified as part of "basic-card". This
 // is used to know whether to return the card network name (e.g., "visa") or
 // "basic-card" in the PaymentResponse. |method_data.supported_networks| is
@@ skipping 15 matching lines @@
 // i18n::phonenumbers::PhoneNumberUtil::Format, as defined in the Payment
 // Request spec
 // (https://w3c.github.io/browser-payment-api/#paymentrequest-updated-algorithm)
 std::string FormatPhoneForResponse(const std::string& phone_number,
                                    const std::string& country_code);
 
 }  // namespace data_util
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CORE_PAYMENT_REQUEST_DATA_UTIL_H_