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

components/autofill/core/browser/autofill_common_test.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_common_test.h"
 
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "content/public/browser/browser_context.h"
 
 namespace autofill {
 namespace test {
 
@@ skipping 40 matching lines @@
   form->fields.push_back(field);
   test::CreateTestFormField("Country", "country", "", "text", &field);
   form->fields.push_back(field);
   test::CreateTestFormField("Phone Number", "phonenumber", "", "tel", &field);
   form->fields.push_back(field);
   test::CreateTestFormField("Email", "email", "", "email", &field);
   form->fields.push_back(field);
 }
 
 inline void check_and_set(
-    FormGroup* profile, AutofillFieldType type, const char* value) {
+    FormGroup* profile, ServerFieldType type, const char* value) {
   if (value)
     profile->SetRawInfo(type, UTF8ToUTF16(value));
 }
 
 AutofillProfile GetFullProfile() {
   AutofillProfile profile(base::GenerateGUID(), "http://www.example.com/");
   SetProfileInfo(&profile,
                  "John",
                  "H.",
                  "Doe",
@@ skipping 101 matching lines @@
   // Disable auxiliary profiles for unit testing.  These reach out to system
   // services on the Mac.
   if (browser_context) {
     user_prefs::UserPrefs::Get(browser_context)->SetBoolean(
         prefs::kAutofillAuxiliaryProfilesEnabled, false);
   }
 }
 
 }  // namespace test
 }  // namespace autofill