[Payments] Normalize billing address for response on Desktop.

ios/chrome/browser/ui/payments/payment_request_coordinator.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/ui/payments/payment_request_coordinator.h"
 
 #include <unordered_set>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
@@ skipping 202 matching lines @@
   // the name of the network directly.
   std::string basic_card_type =
       autofill::data_util::GetPaymentRequestData(card.type())
           .basic_card_payment_type;
   paymentResponse.method_name =
       _paymentRequest->basic_card_specified_networks().find(basic_card_type) !=
               _paymentRequest->basic_card_specified_networks().end()
           ? base::ASCIIToUTF16("basic-card")
           : base::ASCIIToUTF16(basic_card_type);
 
+  // Get the billing address
+  autofill::AutofillProfile billing_address;

[Moe, 2017/04/26 18:03:49]

s/billing_address/billingAddress

[sebsg, 2017/04/26 18:28:26]

Done.

+
+  // TODO(crbug.com/714768): Make sure the billing address is set and valid
+  // before getting here. Once the bug is addressed, there will be no need to
+  // copy the address, *billing_address_ptr can be used to get the basic card
+  // response.
+  if (!card.billing_address_id().empty()) {
+    autofill::AutofillProfile* billing_address_ptr =
+        autofill::PersonalDataManager::GetProfileFromProfilesByGUID(

[Moe, 2017/04/26 18:03:49]

s/billing_address_ptr/billingAddressPtr

[sebsg, 2017/04/26 18:28:26]

Done.

+            card.billing_address_id(), _paymentRequest->billing_profiles());
+    if (billing_address_ptr)
+      billing_address = *billing_address_ptr;
+  }
+
   paymentResponse.details = GetBasicCardResponseFromAutofillCreditCard(
-      card, cvc, _paymentRequest->billing_profiles(),
+      card, cvc, billing_address,
       GetApplicationContext()->GetApplicationLocale());
 
   if (_paymentRequest->request_shipping()) {
     autofill::AutofillProfile* shippingAddress =
         _paymentRequest->selected_shipping_profile();
     // TODO(crbug.com/602666): User should get here only if they have selected
     // a shipping address.
     DCHECK(shippingAddress);
     paymentResponse.shipping_address = GetPaymentAddressFromAutofillProfile(
         *shippingAddress, GetApplicationContext()->GetApplicationLocale());
@@ skipping 244 matching lines @@
 - (void)paymentMethodSelectionCoordinatorDidReturn:
     (PaymentMethodSelectionCoordinator*)coordinator {
   // Clear the 'Updated' label on the payment summary item, if there is one.
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_methodSelectionCoordinator stop];
   _methodSelectionCoordinator = nil;
 }
 
 @end