Remove application locale cache in autofill code.

components/autofill/browser/personal_data_manager_mac.mm

 // 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/personal_data_manager.h"
 
 #include <math.h>
 
 #import <AddressBook/AddressBook.h>
 
@@ skipping 24 matching lines @@
  public:
   // Constructor takes a reference to the |profiles| that will be filled in
   // by the subsequent call to |GetAddressBookMeCard()|.  |profiles| may not
   // be NULL.
   explicit AuxiliaryProfilesImpl(ScopedVector<AutofillProfile>* profiles)
       : profiles_(*profiles) {
   }
   virtual ~AuxiliaryProfilesImpl() {}
 
   // Import the "me" card from the Mac Address Book and fill in |profiles_|.
-  void GetAddressBookMeCard();
+  void GetAddressBookMeCard(const std::string& app_locale);
 
  private:
   void GetAddressBookNames(ABPerson* me,
                            NSString* addressLabelRaw,
                            AutofillProfile* profile);
   void GetAddressBookAddress(NSDictionary* address, AutofillProfile* profile);
   void GetAddressBookEmail(ABPerson* me,
                            NSString* addressLabelRaw,
                            AutofillProfile* profile);
   void GetAddressBookPhoneNumbers(ABPerson* me,
                                   NSString* addressLabelRaw,
                                   AutofillProfile* profile);
 
  private:
   // A reference to the profiles this class populates.
   ScopedVector<AutofillProfile>& profiles_;
 
   DISALLOW_COPY_AND_ASSIGN(AuxiliaryProfilesImpl);
 };
 
 // This method uses the |ABAddressBook| system service to fetch the "me" card
 // from the active user's address book.  It looks for the user address
 // information and translates it to the internal list of |AutofillProfile| data
 // structures.
-void AuxiliaryProfilesImpl::GetAddressBookMeCard() {
+void AuxiliaryProfilesImpl::GetAddressBookMeCard(
+    const std::string& app_locale) {
   profiles_.clear();
 
   // +[ABAddressBook sharedAddressBook] throws an exception internally in
   // circumstances that aren't clear. The exceptions are only observed in crash
   // reports, so it is unknown whether they would be caught by AppKit and nil
   // returned, or if they would take down the app. In either case, avoid
   // crashing. http://crbug.com/129022
   ABAddressBook* addressBook = base::mac::RunBlockIgnoringExceptions(^{
       return [ABAddressBook sharedAddressBook];
   });
@@ skipping 34 matching lines @@
     guid += base::StringPrintf(kAddressGUIDFormat.c_str(), i);
     DCHECK_EQ(kGUIDLength, guid.size());
 
     scoped_ptr<AutofillProfile> profile(new AutofillProfile(guid));
     DCHECK(base::IsValidGUID(profile->guid()));
 
     // Fill in name and company information.
     GetAddressBookNames(me, addressLabelRaw, profile.get());
 
     // Fill in address information.
-    GetAddressBookAddress(address, profile.get());
+    GetAddressBookAddress(app_locale, address, profile.get());
 
     // Fill in email information.
     GetAddressBookEmail(me, addressLabelRaw, profile.get());
 
     // Fill in phone number information.
     GetAddressBookPhoneNumbers(me, addressLabelRaw, profile.get());
 
     profiles_.push_back(profile.release());
   }
 }
@@ skipping 15 matching lines @@
   profile->SetRawInfo(NAME_LAST, base::SysNSStringToUTF16(lastName));
   if ([addressLabelRaw isEqualToString:kABAddressWorkLabel])
     profile->SetRawInfo(COMPANY_NAME, base::SysNSStringToUTF16(companyName));
 }
 
 // Addresss information from the Address Book may span multiple lines.
 // If it does then we represent the address with two lines in the profile.  The
 // second line we join with commas.
 // For example:  "c/o John Doe\n1122 Other Avenue\nApt #7" translates to
 // line 1: "c/o John Doe", line 2: "1122 Other Avenue, Apt #7".
-void AuxiliaryProfilesImpl::GetAddressBookAddress(NSDictionary* address,
+void AuxiliaryProfilesImpl::GetAddressBookAddress(const std::string& app_locale,
+                                                  NSDictionary* address,
                                                   AutofillProfile* profile) {
   if (NSString* addressField = [address objectForKey:kABAddressStreetKey]) {
     // If there are newlines in the address, split into two lines.
     if ([addressField rangeOfCharacterFromSet:
             [NSCharacterSet newlineCharacterSet]].location != NSNotFound) {
       NSArray* chunks = [addressField componentsSeparatedByCharactersInSet:
           [NSCharacterSet newlineCharacterSet]];
       DCHECK([chunks count] > 1);
 
       NSString* separator = l10n_util::GetNSString(
@@ skipping 18 matching lines @@
 
   if (NSString* state = [address objectForKey:kABAddressStateKey])
     profile->SetRawInfo(ADDRESS_HOME_STATE, base::SysNSStringToUTF16(state));
 
   if (NSString* zip = [address objectForKey:kABAddressZIPKey])
     profile->SetRawInfo(ADDRESS_HOME_ZIP, base::SysNSStringToUTF16(zip));
 
   if (NSString* country = [address objectForKey:kABAddressCountryKey]) {
     profile->SetInfo(ADDRESS_HOME_COUNTRY,
                      base::SysNSStringToUTF16(country),
-                     AutofillCountry::ApplicationLocale());
+                     app_locale);
   }
 }
 
 // Fills in email address matching current address label.  Note that there may
 // be multiple matching email addresses for a given label.  We take the
 // first we find (topmost) as preferred.
 void AuxiliaryProfilesImpl::GetAddressBookEmail(
     ABPerson* me,
     NSString* addressLabelRaw,
     AutofillProfile* profile) {
@@ skipping 40 matching lines @@
       profile->SetRawInfo(PHONE_HOME_WHOLE_NUMBER, phone);
     }
   }
 }
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
-  impl.GetAddressBookMeCard();
+  impl.GetAddressBookMeCard(app_locale_);
 }