Reduce boxing and unboxing of AutofillFieldType

chrome/browser/sync/glue/autofill_profile_model_associator.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/sync/glue/autofill_profile_model_associator.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sync/glue/autofill_profile_change_processor.h"
 #include "chrome/browser/sync/glue/do_optimistic_refresh_task.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 44 matching lines @@
     std::vector<std::string>* profiles_to_delete) {
 
   if (VLOG_IS_ON(2)) {
     VLOG(2) << "[AUTOFILL MIGRATION]"
             << "Printing profiles from web db";
 
     for (std::vector<AutofillProfile*>::const_iterator ix =
         all_profiles_from_db.begin(); ix != all_profiles_from_db.end(); ++ix) {
       AutofillProfile* p = *ix;
       VLOG(2) << "[AUTOFILL MIGRATION]  "
-              << p->GetFieldText(AutofillType(NAME_FIRST))
-              << p->GetFieldText(AutofillType(NAME_LAST))
+              << p->GetFieldText(NAME_FIRST)
+              << p->GetFieldText(NAME_LAST)
               << p->guid();
     }
   }
 
   VLOG(1) << "[AUTOFILL MIGRATION]"
           << "Looking for the above data in sync db..";
 
   // Alias the all_profiles_from_db so we fit in 80 characters
   const std::vector<AutofillProfile*>& profiles(all_profiles_from_db);
   for (std::vector<AutofillProfile*>::const_iterator ix = profiles.begin();
       ix != profiles.end();
       ++ix) {
     std::string guid((*ix)->guid());
     if (guid::IsValidGUID(guid) == false) {
       DCHECK(false) << "Guid in the web db is invalid " << guid;
       continue;
     }
 
     ReadNode node(write_trans);
     if (node.InitByClientTagLookup(syncable::AUTOFILL_PROFILE, guid) &&
         // The following check is to ensure the given sync node is not already
         // associated with another profile. That could happen if the user has
         // the same profile duplicated.
         current_profiles->find(guid) == current_profiles->end()) {
       VLOG(2) << "[AUTOFILL MIGRATION]"
               << " Found in sync db: "
-              << (*ix)->GetFieldText(AutofillType(NAME_FIRST))
-              << (*ix)->GetFieldText(AutofillType(NAME_LAST))
+              << (*ix)->GetFieldText(NAME_FIRST)
+              << (*ix)->GetFieldText(NAME_LAST)
               << (*ix)->guid()
               << " so associating with node id " << node.GetId();
       const sync_pb::AutofillProfileSpecifics& autofill(
           node.GetAutofillProfileSpecifics());
       if (OverwriteProfileWithServerData(*ix, autofill)) {
         updated_profiles->push_back(*ix);
       }
       Associate(&guid, node.GetId());
       current_profiles->insert(guid);
     } else {
@@ skipping 98 matching lines @@
   id_map_.clear();
   id_map_inverse_.clear();
   return true;
 }
 
 // Helper to compare the local value and cloud value of a field, merge into
 // the local value if they differ, and return whether the merge happened.
 bool AutofillProfileModelAssociator::MergeField(FormGroup* f,
     AutofillFieldType t,
     const std::string& specifics_field) {
-  if (UTF16ToUTF8(f->GetFieldText(AutofillType(t))) == specifics_field)
+  if (UTF16ToUTF8(f->GetFieldText(t)) == specifics_field)
     return false;
-  f->SetInfo(AutofillType(t), UTF8ToUTF16(specifics_field));
+  f->SetInfo(t, UTF8ToUTF16(specifics_field));
   return true;
 }
 bool AutofillProfileModelAssociator::SyncModelHasUserCreatedNodes(
     bool *has_nodes) {
   CHECK_NE(has_nodes, reinterpret_cast<bool*>(NULL));
   sync_api::ReadTransaction trans(sync_service_->GetUserShare());
 
   sync_api::ReadNode node(&trans);
 
   if (!node.InitByTagLookup(kAutofillProfileTag)) {
@@ skipping 90 matching lines @@
       return false;
     }
     AutofillProfile* p = new AutofillProfile(autofill_specifics.guid());
     OverwriteProfileWithServerData(p, autofill_specifics);
     new_profiles->push_back(p);
     std::string guid = autofill_specifics.guid();
     Associate(&guid, sync_node_id);
     current_profiles->insert(autofill_specifics.guid());
     VLOG(2) << "[AUTOFILL MIGRATION]"
             << "Found in sync db but with a different guid: "
-            << UTF16ToUTF8(profile.GetFieldText(AutofillType(NAME_FIRST)))
-            << UTF16ToUTF8(profile.GetFieldText(AutofillType(NAME_LAST)))
+            << UTF16ToUTF8(profile.GetFieldText(NAME_FIRST))
+            << UTF16ToUTF8(profile.GetFieldText(NAME_LAST))
             << "New guid " << autofill_specifics.guid() << " sync node id "
             << sync_node_id << " so associating. Profile to be deleted "
             << profile.guid();
   } else {
     sync_api::WriteNode node(trans);
 
     // The profile.guid() is expected to be a valid guid. The caller is expected
     // to pass in a valid profile object with a valid guid. Having to check in
     // 2 places(the caller and here) is not optimal.
     if (!node.InitUniqueByCreation(
              syncable::AUTOFILL_PROFILE, autofill_root, profile.guid())) {
       LOG(ERROR) << "Failed to create autofill sync node.";
       return false;
     }
     node.SetTitle(UTF8ToWide(profile.guid()));
     VLOG(2) << "[AUTOFILL MIGRATION]"
             << "NOT Found in sync db  "
-            << UTF16ToUTF8(profile.GetFieldText(AutofillType(NAME_FIRST)))
-            << UTF16ToUTF8(profile.GetFieldText(AutofillType(NAME_LAST)))
+            << UTF16ToUTF8(profile.GetFieldText(NAME_FIRST))
+            << UTF16ToUTF8(profile.GetFieldText(NAME_LAST))
             << profile.guid()
             << " so creating a new sync node. Sync node id "
             << node.GetId();
     AutofillProfileChangeProcessor::WriteAutofillProfile(profile, &node);
     current_profiles->insert(profile.guid());
     std::string guid = profile.guid();
     Associate(&guid, node.GetId());
     number_of_profiles_created_++;
   }
   return true;
@@ skipping 140 matching lines @@
 
 AutofillProfileModelAssociator::DataBundle::DataBundle() {}
 
 AutofillProfileModelAssociator::DataBundle::~DataBundle() {
   STLDeleteElements(&new_profiles);
 }
 
 
 }  // namespace browser_sync