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

components/autofill/core/browser/address_field.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/address_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 118 matching lines @@
       address1_(NULL),
       address2_(NULL),
       city_(NULL),
       state_(NULL),
       zip_(NULL),
       zip4_(NULL),
       country_(NULL),
       type_(kGenericAddress) {
 }
 
-bool AddressField::ClassifyField(FieldTypeMap* map) const {
-  AutofillFieldType address_company;
-  AutofillFieldType address_line1;
-  AutofillFieldType address_line2;
-  AutofillFieldType address_city;
-  AutofillFieldType address_state;
-  AutofillFieldType address_zip;
-  AutofillFieldType address_country;
+bool AddressField::ClassifyField(ServerFieldTypeMap* map) const {
+  ServerFieldType address_company;
+  ServerFieldType address_line1;
+  ServerFieldType address_line2;
+  ServerFieldType address_city;
+  ServerFieldType address_state;
+  ServerFieldType address_zip;
+  ServerFieldType address_country;
 
   switch (type_) {
     case kShippingAddress:
      // Fall through. Autofill does not support shipping addresses.
     case kGenericAddress:
       address_company = COMPANY_NAME;
       address_line1 = ADDRESS_HOME_LINE1;
       address_line2 = ADDRESS_HOME_LINE2;
       address_city = ADDRESS_HOME_CITY;
       address_state = ADDRESS_HOME_STATE;
@@ skipping 175 matching lines @@
   if (bill == base::string16::npos && ship != base::string16::npos)
     return kShippingAddress;
 
   if (bill > ship)
     return kBillingAddress;
 
   return kShippingAddress;
 }
 
 }  // namespace autofill