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

components/autofill/core/browser/credit_card_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/credit_card_field.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 175 matching lines @@
       cardholder_last_(NULL),
       type_(NULL),
       number_(NULL),
       verification_(NULL),
       expiration_month_(NULL),
       expiration_year_(NULL),
       expiration_date_(NULL),
       is_two_digit_year_(false) {
 }
 
-bool CreditCardField::ClassifyField(FieldTypeMap* map) const {
+bool CreditCardField::ClassifyField(ServerFieldTypeMap* map) const {
   bool ok = AddClassification(number_, CREDIT_CARD_NUMBER, map);
   ok = ok && AddClassification(type_, CREDIT_CARD_TYPE, map);
   ok = ok && AddClassification(verification_, CREDIT_CARD_VERIFICATION_CODE,
                                map);
 
   // If the heuristics detected first and last name in separate fields,
   // then ignore both fields. Putting them into separate fields is probably
   // wrong, because the credit card can also contain a middle name or middle
   // initial.
   if (cardholder_last_ == NULL)
@@ skipping 17 matching lines @@
       ok = ok && AddClassification(expiration_year_,
                                    CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                    map);
     }
   }
 
   return ok;
 }
 
 }  // namespace autofill