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

components/autofill/core/browser/autofill_ie_toolbar_import_win.cc

Index: components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
diff --git a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
index 4ac4edcbad296580bbcdf630d3d4e7f1fe721670..388e079f3effca05cef53a0811339697388950f5 100644
--- a/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
+++ b/components/autofill/core/browser/autofill_ie_toolbar_import_win.cc
@@ -99,7 +99,7 @@ base::string16 ReadAndDecryptValue(const RegKey& key,
 }
 
 struct {
-  AutofillFieldType field_type;
+  ServerFieldType field_type;
   const wchar_t *reg_value_name;
 } profile_reg_values[] = {
   { NAME_FIRST,                    L"name_first" },
@@ -131,7 +131,7 @@ struct {
   // We do not import verification code.
 };
 
-typedef std::map<std::wstring, AutofillFieldType> RegToFieldMap;
+typedef std::map<std::wstring, ServerFieldType> RegToFieldMap;
 
 // Imports address or credit card data from the given registry |key| into the
 // given |form_group|, with the help of |reg_to_field|.  When importing address
@@ -163,9 +163,9 @@ bool ImportSingleFormGroup(const RegKey& key,
 
       // Phone numbers are stored piece-by-piece, and then reconstructed from
       // the pieces.  The rest of the fields are set "as is".
-      if (!phone || !phone->SetInfo(it->second, field_value)) {
+      if (!phone || !phone->SetInfo(AutofillType(it->second), field_value)) {
         has_non_empty_fields = true;
-        form_group->SetInfo(it->second, field_value, app_locale);
+        form_group->SetInfo(AutofillType(it->second), field_value, app_locale);
       }
     }
   }