[Autofill] Canonicalize country names loaded from the Mac OS X Address Book, according to the user'…

chrome/browser/autofill/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 "chrome/browser/autofill/personal_data_manager.h"
 
 #include <math.h>
 
 #import <AddressBook/AddressBook.h>
 
 #include "base/format_macros.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #import "base/mac/scoped_nsexception_enabler.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 // This implementation makes use of the Address Book API.  Profiles are
 // generated that correspond to addresses in the "me" card that reside in the
 // user's Address Book.  The caller passes a vector of profiles into the
@@ skipping 11 matching lines @@
   }
   virtual ~AuxiliaryProfilesImpl() {}
 
   // Import the "me" card from the Mac Address Book and fill in |profiles_|.
   void GetAddressBookMeCard();
 
  private:
   void GetAddressBookNames(ABPerson* me,
                            NSString* addressLabelRaw,
                            AutofillProfile* profile);
-  void GetAddressBookAddresses(NSDictionary* address, 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_;
@@ skipping 52 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.
-    GetAddressBookAddresses(address, profile.get());
+    GetAddressBookAddress(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::GetAddressBookAddresses(NSDictionary* address,
-                                                    AutofillProfile* profile) {
+void AuxiliaryProfilesImpl::GetAddressBookAddress(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(
             IDS_AUTOFILL_MAC_ADDRESS_LINE_SEPARATOR);
@@ skipping 15 matching lines @@
   if (NSString* city = [address objectForKey:kABAddressCityKey])
     profile->SetRawInfo(ADDRESS_HOME_CITY, base::SysNSStringToUTF16(city));
 
   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->SetRawInfo(ADDRESS_HOME_COUNTRY,
-                        base::SysNSStringToUTF16(country));
+    profile->SetInfo(ADDRESS_HOME_COUNTRY,
+                     base::SysNSStringToUTF16(country),
+                     AutofillCountry::ApplicationLocale());
   }
 }
 
 // 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 42 matching lines @@
   }
 }
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
   impl.GetAddressBookMeCard();
 }