[Payment Request] Queries application locale from payments::PaymentRequest

ios/chrome/browser/ui/payments/payment_request_manager.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_manager.h"
 
 #include <string>
 
 #include "base/ios/block_types.h"
 #include "base/ios/ios_util.h"
@@ skipping 11 matching lines @@
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/ios/browser/autofill_driver_ios.h"
 #include "components/payments/core/address_normalization_manager.h"
 #include "components/payments/core/can_make_payment_query.h"
 #include "components/payments/core/payment_address.h"
 #include "components/payments/core/payment_prefs.h"
 #include "components/payments/core/payment_request_base_delegate.h"
 #include "components/payments/core/payment_request_data_util.h"
 #include "components/prefs/pref_service.h"
-#include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/autofill/validation_rules_storage_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/payments/ios_can_make_payment_query_factory.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #include "ios/chrome/browser/procedural_block_types.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #import "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/payments/js_payment_request_manager.h"
@@ skipping 330 matching lines @@
        personalDataManager->GetProfilesToSuggest()) {
     std::string countryCode =
         base::UTF16ToUTF8(profile->GetRawInfo(autofill::ADDRESS_HOME_COUNTRY));
     if (autofill::data_util::IsValidCountryCode(countryCode)) {
       addressNormalizer->LoadRulesForRegion(countryCode);
     }
   }
 
   const std::string default_country_code =
       autofill::AutofillCountry::CountryCodeForLocale(
-          GetApplicationContext()->GetApplicationLocale());
+          _paymentRequest->GetApplicationLocale());
 
   _addressNormalizationManager =
       base::MakeUnique<payments::AddressNormalizationManager>(
           addressNormalizer, default_country_code);
 }
 
 // Ensures that |_paymentRequest| is set to the correct value for |message|.
 // Returns YES if |_paymentRequest| was already set to the right value, or if it
 // was updated to match |message|.
 - (BOOL)createPaymentRequestFromMessage:(const base::DictionaryValue&)message {
@@ skipping 333 matching lines @@
 
   paymentResponse.method_name =
       base::ASCIIToUTF16(_pendingPaymentResponse.methodName);
 
   paymentResponse.details = _pendingPaymentResponse.stringifiedDetails;
 
   if (_paymentRequest->request_shipping()) {
     paymentResponse.shipping_address =
         payments::data_util::GetPaymentAddressFromAutofillProfile(
             _pendingPaymentResponse.shippingAddress,
-            GetApplicationContext()->GetApplicationLocale());
+            _paymentRequest->GetApplicationLocale());
 
     web::PaymentShippingOption* shippingOption =
         _paymentRequest->selected_shipping_option();
     DCHECK(shippingOption);
     paymentResponse.shipping_option = shippingOption->id;
   }
 
   if (_paymentRequest->request_payer_name()) {
     paymentResponse.payer_name = _pendingPaymentResponse.contactAddress.GetInfo(
         autofill::AutofillType(autofill::NAME_FULL),
-        GetApplicationContext()->GetApplicationLocale());
+        _paymentRequest->GetApplicationLocale());
   }
 
   if (_paymentRequest->request_payer_email()) {
     paymentResponse.payer_email =
         _pendingPaymentResponse.contactAddress.GetRawInfo(
             autofill::EMAIL_ADDRESS);
   }
 
   if (_paymentRequest->request_payer_phone()) {
     paymentResponse.payer_phone =
@@ skipping 11 matching lines @@
                              completionHandler:nil];
   [self setUnblockEventQueueTimer];
   [self setPaymentResponseTimeoutTimer];
 }
 
 - (void)paymentRequestCoordinator:(PaymentRequestCoordinator*)coordinator
          didSelectShippingAddress:
              (const autofill::AutofillProfile&)shippingAddress {
   payments::PaymentAddress address =
       payments::data_util::GetPaymentAddressFromAutofillProfile(
-          shippingAddress, GetApplicationContext()->GetApplicationLocale());
+          shippingAddress, _paymentRequest->GetApplicationLocale());
   [_paymentRequestJsManager updateShippingAddress:address
                                 completionHandler:nil];
   [self setUnblockEventQueueTimer];
   [self setUpdateEventTimeoutTimer];
 }
 
 - (void)paymentRequestCoordinator:(PaymentRequestCoordinator*)coordinator
           didSelectShippingOption:
               (const web::PaymentShippingOption&)shippingOption {
   [_paymentRequestJsManager updateShippingOption:shippingOption
                                completionHandler:nil];
   [self setUnblockEventQueueTimer];
   [self setUpdateEventTimeoutTimer];
 }
 
 #pragma mark - CRWWebStateObserver methods
 
 - (void)webState:(web::WebState*)webState
     didCommitNavigationWithDetails:
         (const web::LoadCommittedDetails&)load_details {
   [self dismissUI];
   [self enableCurrentWebState];
 }
 
 @end