[Payments] Return a basic card response

ios/chrome/browser/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/payments/payment_request_coordinator.h"
 
 #include <unordered_set>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/payments/full_card_request.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h"
+#include "components/payments/core/payment_address.h"
+#include "components/payments/core/payment_request_data_util.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #include "ios/chrome/browser/payments/payment_request_util.h"
 #include "ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
-using ::payment_request_util::GetBasicCardResponseFromAutofillCreditCard;
-using ::payment_request_util::GetPaymentAddressFromAutofillProfile;
+using ::payments::data_util::GetBasicCardResponseFromAutofillCreditCard;
+using ::payments::data_util::GetPaymentAddressFromAutofillProfile;
 }  // namespace
 
 // The unmask prompt UI for Payment Request.
 class PRCardUnmaskPromptViewBridge
     : public autofill::CardUnmaskPromptViewBridge {
  public:
   explicit PRCardUnmaskPromptViewBridge(
       autofill::CardUnmaskPromptController* controller,
       UIViewController* base_view_controller)
       : autofill::CardUnmaskPromptViewBridge(controller),
@@ skipping 141 matching lines @@
 }
 
 - (void)fullCardRequestDidSucceedWithCard:(const autofill::CreditCard&)card
                                       CVC:(const base::string16&)cvc {
   web::PaymentResponse paymentResponse;
 
   paymentResponse.method_name =
       base::ASCIIToUTF16(autofill::data_util::GetPaymentRequestData(card.type())
                              .basic_card_payment_type);
 
-  paymentResponse.details =
-      GetBasicCardResponseFromAutofillCreditCard(*_paymentRequest, card, cvc);
+  paymentResponse.details = GetBasicCardResponseFromAutofillCreditCard(
+      card, cvc, _paymentRequest->billing_profiles(),
+      GetApplicationContext()->GetApplicationLocale());
 
   if (_paymentRequest->payment_options().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);
+    paymentResponse.shipping_address = GetPaymentAddressFromAutofillProfile(
+        *shippingAddress, GetApplicationContext()->GetApplicationLocale());
 
     web::PaymentShippingOption* shippingOption =
         _paymentRequest->selected_shipping_option();
     DCHECK(shippingOption);
     paymentResponse.shipping_option = shippingOption->id;
   }
 
   if (_paymentRequest->payment_options().request_payer_name) {
     autofill::AutofillProfile* contactInfo =
         _paymentRequest->selected_contact_profile();
@@ skipping 170 matching lines @@
 }
 
 #pragma mark - ShippingAddressSelectionCoordinatorDelegate
 
 - (void)shippingAddressSelectionCoordinator:
             (ShippingAddressSelectionCoordinator*)coordinator
                    didSelectShippingAddress:
                        (autofill::AutofillProfile*)shippingAddress {
   _pendingShippingAddress = shippingAddress;
   DCHECK(shippingAddress);
-  web::PaymentAddress address =
-      GetPaymentAddressFromAutofillProfile(*shippingAddress);
+  payments::PaymentAddress address = GetPaymentAddressFromAutofillProfile(
+      *shippingAddress, GetApplicationContext()->GetApplicationLocale());
   [_delegate paymentRequestCoordinator:self didSelectShippingAddress:address];
 }
 
 - (void)shippingAddressSelectionCoordinatorDidReturn:
     (ShippingAddressSelectionCoordinator*)coordinator {
   // Clear the 'Updated' label on the payment summary item, if there is one.
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_shippingAddressSelectionCoordinator stop];
   _shippingAddressSelectionCoordinator = nil;
@@ skipping 37 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