Reduce boxing and unboxing of AutofillFieldType

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/scoped_ptr.h"
@@ skipping 93 matching lines @@
 // We only propagate the company name to work profiles.
 void AuxiliaryProfilesImpl::GetAddressBookNames(
     ABPerson* me,
     NSString* addressLabelRaw,
     AutofillProfile* profile) {
   NSString* firstName = [me valueForProperty:kABFirstNameProperty];
   NSString* middleName = [me valueForProperty:kABMiddleNameProperty];
   NSString* lastName = [me valueForProperty:kABLastNameProperty];
   NSString* companyName = [me valueForProperty:kABOrganizationProperty];
 
-  profile->SetInfo(AutofillType(NAME_FIRST),
+  profile->SetInfo(NAME_FIRST,

[dhollowa, 2011/03/16 17:07:11]

nit: A number of these should fit on single line now.

[Ilya Sherman, 2011/03/17 03:42:29]

Done.

                    base::SysNSStringToUTF16(firstName));
-  profile->SetInfo(AutofillType(NAME_MIDDLE),
+  profile->SetInfo(NAME_MIDDLE,
                    base::SysNSStringToUTF16(middleName));
-  profile->SetInfo(AutofillType(NAME_LAST),
+  profile->SetInfo(NAME_LAST,
                    base::SysNSStringToUTF16(lastName));
   if ([addressLabelRaw isEqualToString:kABAddressWorkLabel]) {
-    profile->SetInfo(AutofillType(COMPANY_NAME),
+    profile->SetInfo(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) {
   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);
 
       NSString* addressField1 = [chunks objectAtIndex:0];
       NSString* addressField2 =
           [[chunks subarrayWithRange:NSMakeRange(1, [chunks count] - 1)]
               componentsJoinedByString:separator];
-      profile->SetInfo(AutofillType(ADDRESS_HOME_LINE1),
+      profile->SetInfo(ADDRESS_HOME_LINE1,
                        base::SysNSStringToUTF16(addressField1));
-      profile->SetInfo(AutofillType(ADDRESS_HOME_LINE2),
+      profile->SetInfo(ADDRESS_HOME_LINE2,
                        base::SysNSStringToUTF16(addressField2));
     } else {
-      profile->SetInfo(AutofillType(ADDRESS_HOME_LINE1),
+      profile->SetInfo(ADDRESS_HOME_LINE1,
                        base::SysNSStringToUTF16(addressField));
     }
   }
 
   if (NSString* city = [address objectForKey:kABAddressCityKey]) {
-    profile->SetInfo(AutofillType(ADDRESS_HOME_CITY),
+    profile->SetInfo(ADDRESS_HOME_CITY,
                      base::SysNSStringToUTF16(city));
   }
   if (NSString* state = [address objectForKey:kABAddressStateKey]) {
-    profile->SetInfo(AutofillType(ADDRESS_HOME_STATE),
+    profile->SetInfo(ADDRESS_HOME_STATE,
                      base::SysNSStringToUTF16(state));
   }
   if (NSString* zip = [address objectForKey:kABAddressZIPKey]) {
-    profile->SetInfo(AutofillType(ADDRESS_HOME_ZIP),
+    profile->SetInfo(ADDRESS_HOME_ZIP,
                      base::SysNSStringToUTF16(zip));
   }
   if (NSString* country = [address objectForKey:kABAddressCountryKey]) {
-    profile->SetInfo(AutofillType(ADDRESS_HOME_COUNTRY),
+    profile->SetInfo(ADDRESS_HOME_COUNTRY,
                      base::SysNSStringToUTF16(country));
   }
 }
 
 // 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) {
   ABMultiValue* emailAddresses = [me valueForProperty:kABEmailProperty];
   NSString* emailAddress = nil;
   for (NSUInteger j = 0, emailCount = [emailAddresses count];
        j < emailCount; j++) {
     NSString* emailAddressLabelRaw = [emailAddresses labelAtIndex:j];
     if ([emailAddressLabelRaw isEqualToString:addressLabelRaw]) {
       emailAddress = [emailAddresses valueAtIndex:j];
       break;
     }
   }
-  profile->SetInfo(AutofillType(EMAIL_ADDRESS),
+  profile->SetInfo(EMAIL_ADDRESS,
                    base::SysNSStringToUTF16(emailAddress));
 }
 
 // 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(AutofillType(PHONE_HOME_NUMBER), number);
-      profile->SetInfo(AutofillType(PHONE_HOME_CITY_CODE), city_code);
-      profile->SetInfo(AutofillType(PHONE_HOME_COUNTRY_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);
     } 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(AutofillType(PHONE_FAX_NUMBER), number);
-      profile->SetInfo(AutofillType(PHONE_FAX_CITY_CODE), city_code);
-      profile->SetInfo(AutofillType(PHONE_FAX_COUNTRY_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);
     } 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(AutofillType(PHONE_HOME_NUMBER), number);
-      profile->SetInfo(AutofillType(PHONE_HOME_CITY_CODE), city_code);
-      profile->SetInfo(AutofillType(PHONE_HOME_COUNTRY_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);
     } 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(AutofillType(PHONE_FAX_NUMBER), number);
-      profile->SetInfo(AutofillType(PHONE_FAX_CITY_CODE), city_code);
-      profile->SetInfo(AutofillType(PHONE_FAX_COUNTRY_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);
     }
   }
 }
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
   impl.GetAddressBookMeCard();
 }