Remove application locale cache in autofill code.

chrome/browser/ui/autofill/data_model_wrapper.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
-#include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/form_group.h"
 #include "components/autofill/browser/form_structure.h"
 #include "components/autofill/browser/wallet/full_wallet.h"
 #include "components/autofill/browser/wallet/wallet_address.h"
 #include "components/autofill/browser/wallet/wallet_items.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 49 matching lines @@
 // AutofillFormGroupWrapper
 
 AutofillFormGroupWrapper::AutofillFormGroupWrapper(const FormGroup* form_group,
                                                    size_t variant)
     : form_group_(form_group),
       variant_(variant) {}
 
 AutofillFormGroupWrapper::~AutofillFormGroupWrapper() {}
 
 string16 AutofillFormGroupWrapper::GetInfo(AutofillFieldType type) {
-  return form_group_->GetInfo(type, AutofillCountry::ApplicationLocale());
+  return form_group_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 void AutofillFormGroupWrapper::FillFormField(AutofillField* field) {
-  form_group_->FillFormField(*field, variant_, field);
+  form_group_->FillFormField(
+      *field, variant_, g_browser_process->GetApplicationLocale(), field);
 }
 
 // AutofillProfileWrapper
 
 AutofillProfileWrapper::AutofillProfileWrapper(
     const AutofillProfile* profile, size_t variant)
     : AutofillFormGroupWrapper(profile, variant),
       profile_(profile) {}
 
 AutofillProfileWrapper::~AutofillProfileWrapper() {}
 
 void AutofillProfileWrapper::FillInputs(DetailInputs* inputs) {
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
   for (size_t j = 0; j < inputs->size(); ++j) {
     std::vector<string16> values;
-    profile_->GetMultiInfo((*inputs)[j].type, app_locale, &values);
+    profile_->GetMultiInfo((*inputs)[j].type,
+                           g_browser_process->GetApplicationLocale(),
+                           &values);
     (*inputs)[j].initial_value = values[variant()];
   }
 }
 
 // AutofillCreditCardWrapper
 
 AutofillCreditCardWrapper::AutofillCreditCardWrapper(const CreditCard* card)
     : AutofillFormGroupWrapper(card, 0),
       card_(card) {}
 
@@ skipping 31 matching lines @@
 }
 
 // WalletAddressWrapper
 
 WalletAddressWrapper::WalletAddressWrapper(
     const wallet::Address* address) : address_(address) {}
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
 string16 WalletAddressWrapper::GetInfo(AutofillFieldType type) {
-  return address_->GetInfo(type);
+  return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 // WalletInstrumentWrapper
 
 WalletInstrumentWrapper::WalletInstrumentWrapper(
     const wallet::WalletItems::MaskedInstrument* instrument)
     : instrument_(instrument) {}
 
 WalletInstrumentWrapper::~WalletInstrumentWrapper() {}
 
 string16 WalletInstrumentWrapper::GetInfo(AutofillFieldType type) {
   if (type == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(instrument_->expiration_month());
 
-  return instrument_->GetInfo(type);
+  return instrument_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 gfx::Image WalletInstrumentWrapper::GetIcon() {
   return instrument_->CardIcon();
 }
 
 string16 WalletInstrumentWrapper::GetDisplayText() {
   // TODO(estade): descriptive_name() is user-provided. Should we use it or
   // just type + last 4 digits?
   string16 line1 = instrument_->descriptive_name();
   return line1 + ASCIIToUTF16("\n") + DataModelWrapper::GetDisplayText();
 }
 
 // FullWalletBillingWrapper
 
 FullWalletBillingWrapper::FullWalletBillingWrapper(
     wallet::FullWallet* full_wallet)
     : full_wallet_(full_wallet) {
   DCHECK(full_wallet_);
 }
 
 FullWalletBillingWrapper::~FullWalletBillingWrapper() {}
 
 string16 FullWalletBillingWrapper::GetInfo(AutofillFieldType type) {
   if (AutofillType(type).group() == AutofillType::CREDIT_CARD)
     return full_wallet_->GetInfo(type);
 
-  return full_wallet_->billing_address()->GetInfo(type);
+  return full_wallet_->billing_address()->GetInfo(
+      type, g_browser_process->GetApplicationLocale());
 }
 
 // FullWalletShippingWrapper
 
 FullWalletShippingWrapper::FullWalletShippingWrapper(
     wallet::FullWallet* full_wallet)
     : full_wallet_(full_wallet) {
   DCHECK(full_wallet_);
 }
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) {
-  return full_wallet_->shipping_address()->GetInfo(type);
+  return full_wallet_->shipping_address()->GetInfo(
+      type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill