These changes *are* for review :)

chrome/browser/autofill/personal_data_manager_mac.mm

 // Copyright (c) 2011 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"
 
 #import <AddressBook/AddressBook.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 171 matching lines @@
 }
 
 // Fills in telephone numbers.  Each of these are special cases.
 // We match four cases: home/tel, home/fax, work/tel, work/fax.
 // Note, we traverse in reverse order so that top values in address book
 // take priority.
 void AuxiliaryProfilesImpl::GetAddressBookPhoneNumbers(
     ABPerson* me,
     NSString* addressLabelRaw,
     AutofillProfile* profile) {
-  string16 number;
-  string16 city_code;
-  string16 country_code;
-
   ABMultiValue* phoneNumbers = [me valueForProperty:kABPhoneProperty];
   for (NSUInteger k = 0, phoneCount = [phoneNumbers count];
        k < phoneCount; k++) {
     NSUInteger reverseK = phoneCount - k - 1;
     NSString* phoneLabelRaw = [phoneNumbers labelAtIndex:reverseK];
     if ([addressLabelRaw isEqualToString:kABAddressHomeLabel] &&
         [phoneLabelRaw isEqualToString:kABPhoneHomeLabel]) {
       string16 homePhone = base::SysNSStringToUTF16(
           [phoneNumbers valueAtIndex:reverseK]);
-      PhoneNumber::ParsePhoneNumber(
-          homePhone, &number, &city_code, &country_code);
-      profile->SetInfo(PHONE_HOME_NUMBER, number);
-      profile->SetInfo(PHONE_HOME_CITY_CODE, city_code);
-      profile->SetInfo(PHONE_HOME_COUNTRY_CODE, country_code);
+      profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, homePhone);
     } else if ([addressLabelRaw isEqualToString:kABAddressHomeLabel] &&
                [phoneLabelRaw isEqualToString:kABPhoneHomeFAXLabel]) {
       string16 homeFax = base::SysNSStringToUTF16(
           [phoneNumbers valueAtIndex:reverseK]);
-      PhoneNumber::ParsePhoneNumber(homeFax,
-          &number, &city_code, &country_code);
-      profile->SetInfo(PHONE_FAX_NUMBER, number);
-      profile->SetInfo(PHONE_FAX_CITY_CODE, city_code);
-      profile->SetInfo(PHONE_FAX_COUNTRY_CODE, country_code);
+      profile->SetInfo(PHONE_FAX_WHOLE_NUMBER, homeFax);
     } else if ([addressLabelRaw isEqualToString:kABAddressWorkLabel] &&
                [phoneLabelRaw isEqualToString:kABPhoneWorkLabel]) {
       string16 workPhone = base::SysNSStringToUTF16(
           [phoneNumbers valueAtIndex:reverseK]);
-      PhoneNumber::ParsePhoneNumber(workPhone,
-          &number, &city_code, &country_code);
-      profile->SetInfo(PHONE_HOME_NUMBER, number);
-      profile->SetInfo(PHONE_HOME_CITY_CODE, city_code);
-      profile->SetInfo(PHONE_HOME_COUNTRY_CODE, country_code);
+      profile->SetInfo(PHONE_HOME_WHOLE_NUMBER, workPhone);
     } else if ([addressLabelRaw isEqualToString:kABAddressWorkLabel] &&
                [phoneLabelRaw isEqualToString:kABPhoneWorkFAXLabel]) {
       string16 workFax = base::SysNSStringToUTF16(
           [phoneNumbers valueAtIndex:reverseK]);
-      PhoneNumber::ParsePhoneNumber(workFax,
-          &number, &city_code, &country_code);
-      profile->SetInfo(PHONE_FAX_NUMBER, number);
-      profile->SetInfo(PHONE_FAX_CITY_CODE, city_code);
-      profile->SetInfo(PHONE_FAX_COUNTRY_CODE, country_code);
+      profile->SetInfo(PHONE_FAX_WHOLE_NUMBER, workFax);
     }
   }
+  profile->NormalizePhones();
 }
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() const {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
   impl.GetAddressBookMeCard();
 }