[Autofill] Distinguish between native field types and potentially HTML field types.

chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc

 // 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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/autofill_helper.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/autofill/core/browser/autofill_common_test.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 
-using autofill::AutofillFieldType;
+using autofill::ServerFieldType;
 using autofill::AutofillKey;
 using autofill::AutofillProfile;
 
 using autofill_helper::AllProfilesMatch;
 using autofill_helper::GetAllKeys;
 using autofill_helper::GetAllProfiles;
 using autofill_helper::GetKeyCount;
 using autofill_helper::GetProfileCount;
 using autofill_helper::RemoveKeys;
 using autofill_helper::SetProfiles;
@@ skipping 69 matching lines @@
   }
   SetProfiles(profile, &autofill_profiles);
 }
 
 void AutofillSyncPerfTest::UpdateProfiles(int profile) {
   const std::vector<AutofillProfile*>& all_profiles =
       GetAllProfiles(profile);
   std::vector<AutofillProfile> autofill_profiles;
   for (size_t i = 0; i < all_profiles.size(); ++i) {
     autofill_profiles.push_back(*all_profiles[i]);
-    autofill_profiles.back().SetRawInfo(AutofillFieldType(autofill::NAME_FIRST),
+    autofill_profiles.back().SetRawInfo(autofill::NAME_FIRST,
                                         UTF8ToUTF16(NextName()));
   }
   SetProfiles(profile, &autofill_profiles);
 }
 
 void AutofillSyncPerfTest::RemoveProfiles(int profile) {
   std::vector<AutofillProfile> empty;
   SetProfiles(profile, &empty);
 }
 
@@ skipping 84 matching lines @@
   ASSERT_EQ(kNumKeys, GetKeyCount(1));
   SyncTimingHelper::PrintResult("autofill", "add_autofill_keys", dt);
 
   RemoveKeys(0);
   // TODO(lipalani): fix this. The following line is added to force sync.
   ForceSync(0);
   dt = SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
   ASSERT_EQ(0, GetKeyCount(1));
   SyncTimingHelper::PrintResult("autofill", "delete_autofill_keys", dt);
 }