Remove application locale cache in autofill code.

components/autofill/browser/wallet/wallet_address.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 "components/autofill/browser/wallet/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/autofill_country.h"
@@ skipping 215 matching lines @@
 
 string16 Address::DisplayNameDetail() const {
 #if defined(OS_ANDROID)
   // TODO(aruslan): improve this stub implementation.
   return address_line_1();
 #else
   return string16();
 #endif
 }
 
-string16 Address::GetInfo(AutofillFieldType type) const {
+string16 Address::GetInfo(AutofillFieldType type,
+                          const std::string& app_locale) const {
   switch (type) {
     case NAME_FULL:
       return recipient_name();
 
     case ADDRESS_HOME_LINE1:
       return address_line_1();
 
     case ADDRESS_HOME_LINE2:
       return address_line_2();
 
     case ADDRESS_HOME_CITY:
       return locality_name();
 
     case ADDRESS_HOME_STATE:
       return administrative_area_name();
 
     case ADDRESS_HOME_ZIP:
       return postal_code_number();
 
     case ADDRESS_HOME_COUNTRY: {
-      AutofillCountry country(country_name_code(),
-                              AutofillCountry::ApplicationLocale());
+      AutofillCountry country(country_name_code(), app_locale);
       return country.name();
     }
 
     case PHONE_HOME_WHOLE_NUMBER:
       return phone_number();
 
     // TODO(estade): implement more.
     default:
       NOTREACHED();
       return string16();
@@ skipping 11 matching lines @@
          phone_number_ == other.phone_number_ &&
          object_id_ == other.object_id_;
 }
 
 bool Address::operator!=(const Address& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill