Reduce boxing and unboxing of AutofillFieldType

chrome/browser/autofill/autofill_ie_toolbar_import_win.cc

 // 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/autofill_ie_toolbar_import_win.h"
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/win/registry.h"
 #include "chrome/browser/autofill/autofill_profile.h"
@@ skipping 119 matching lines @@
       continue;
     RegToFieldMap::const_iterator it = reg_to_field.find(value_name);
     if (it == reg_to_field.end())
       continue;  // This field is not imported.
     string16 field_value = ReadAndDecryptValue(key, value_name.c_str());
     if (!field_value.empty()) {
       has_non_empty_fields = true;
       if (it->second == CREDIT_CARD_NUMBER) {
         field_value = DecryptCCNumber(field_value);
       }
-      profile->SetInfo(AutofillType(it->second), field_value);
+      profile->SetInfo(it->second, field_value);
     }
   }
   return has_non_empty_fields;
 }
 
 // Imports profiles from the IE toolbar and stores them. Asynchronous
 // if PersonalDataManager has not been loaded yet. Deletes itself on completion.
 class AutoFillImporter : public PersonalDataManager::Observer {
  public:
   explicit AutoFillImporter(PersonalDataManager* personal_data_manager)
@@ skipping 51 matching lines @@
                                                    kProfileKey);
   for (; iterator_profiles.Valid(); ++iterator_profiles) {
     std::wstring key_name(kProfileKey);
     key_name.append(L"\\");
     key_name.append(iterator_profiles.Name());
     RegKey key(HKEY_CURRENT_USER, key_name.c_str(), KEY_READ);
     AutofillProfile profile;
     if (ImportSingleProfile(&profile, &key, reg_to_field)) {
       // Combine phones into whole phone #.
       string16 phone;
-      phone = profile.GetFieldText(AutofillType(PHONE_HOME_COUNTRY_CODE));
-      phone.append(profile.GetFieldText(AutofillType(PHONE_HOME_CITY_CODE)));
-      phone.append(profile.GetFieldText(AutofillType(PHONE_HOME_NUMBER)));
-      profile.SetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER), phone);
-      phone = profile.GetFieldText(AutofillType(PHONE_FAX_COUNTRY_CODE));
-      phone.append(profile.GetFieldText(AutofillType(PHONE_FAX_CITY_CODE)));
-      phone.append(profile.GetFieldText(AutofillType(PHONE_FAX_NUMBER)));
-      profile.SetInfo(AutofillType(PHONE_FAX_WHOLE_NUMBER), phone);
+      phone = profile.GetFieldText(PHONE_HOME_COUNTRY_CODE);
+      phone.append(profile.GetFieldText(PHONE_HOME_CITY_CODE));
+      phone.append(profile.GetFieldText(PHONE_HOME_NUMBER));
+      profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, phone);
+      phone = profile.GetFieldText(PHONE_FAX_COUNTRY_CODE);
+      phone.append(profile.GetFieldText(PHONE_FAX_CITY_CODE));
+      phone.append(profile.GetFieldText(PHONE_FAX_NUMBER));
+      profile.SetInfo(PHONE_FAX_WHOLE_NUMBER, phone);
       profiles->push_back(profile);
     }
   }
   string16 password_hash;
   string16 salt;
   RegKey cc_key(HKEY_CURRENT_USER, kCreditCardKey, KEY_READ);
   if (cc_key.Valid()) {
     password_hash = ReadAndDecryptValue(&cc_key, kPasswordHashValue);
     salt = ReadAndDecryptValue(&cc_key, kSaltValue);
   }
 
   // We import CC profiles only if they are not password protected.
   if (password_hash.empty() && IsEmptySalt(salt)) {
     base::win::RegistryKeyIterator iterator_cc(HKEY_CURRENT_USER,
                                                kCreditCardKey);
     for (; iterator_cc.Valid(); ++iterator_cc) {
       std::wstring key_name(kCreditCardKey);
       key_name.append(L"\\");
       key_name.append(iterator_cc.Name());
       RegKey key(HKEY_CURRENT_USER, key_name.c_str(), KEY_READ);
       CreditCard credit_card;
       if (ImportSingleProfile(&credit_card, &key, reg_to_field)) {
-        string16 cc_number = credit_card.GetFieldText(
-            AutofillType(CREDIT_CARD_NUMBER));
+        string16 cc_number = credit_card.GetFieldText(CREDIT_CARD_NUMBER);
         if (!cc_number.empty())
           credit_cards->push_back(credit_card);
       }
     }
   }
   return (profiles->size() + credit_cards->size()) > 0;
 }
 
 bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   // In incognito mode we do not have PDM - and we should not import anything.
   if (!pdm)
     return false;
   AutoFillImporter *importer = new AutoFillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }