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

components/autofill/core/browser/form_field_unittest.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 "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/form_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 120 matching lines @@
 
   field_data.is_checkable = true;
   field_data.label = ASCIIToUTF16("Is PO Box");
   fields.push_back(new AutofillField(field_data, field_data.label));
 
   // reset is_checkable to false.
   field_data.is_checkable = false;
   field_data.label = ASCIIToUTF16("Address line2");
   fields.push_back(new AutofillField(field_data, field_data.label));
 
-  FieldTypeMap field_type_map;
+  ServerFieldTypeMap field_type_map;
   FormField::ParseFormFields(fields.get(), &field_type_map);
   // Checkable element shouldn't interfere with inference of Address line2.
   EXPECT_EQ(2U, field_type_map.size());
 
   EXPECT_EQ(ADDRESS_HOME_LINE1,
             field_type_map.find(ASCIIToUTF16("Address line1"))->second);
   EXPECT_EQ(ADDRESS_HOME_LINE2,
             field_type_map.find(ASCIIToUTF16("Address line2"))->second);
 }
 
 }  // namespace autofill