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

components/autofill/content/browser/wallet/full_wallet.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/content/browser/wallet/full_wallet.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 
 namespace {
 
 const size_t kPanSize = 16;
 const size_t kBinSize = 6;
 const size_t kCvnSize = 3;
 const size_t kEncryptedRestSize = 12;
 
 }  // anonymous namespace
@@ skipping 98 matching lines @@
 
   return scoped_ptr<FullWallet>(new FullWallet(expiration_month,
                                                expiration_year,
                                                iin,
                                                encrypted_rest,
                                                billing_address.Pass(),
                                                shipping_address.Pass(),
                                                required_actions));
 }
 
-base::string16 FullWallet::GetInfo(AutofillFieldType type) {
-  switch (type) {
+base::string16 FullWallet::GetInfo(const AutofillType& type) {
+  switch (type.server_type()) {
     case CREDIT_CARD_NUMBER:
       return UTF8ToUTF16(GetPan());
 
     case CREDIT_CARD_NAME:
       return billing_address()->recipient_name();
 
     case CREDIT_CARD_VERIFICATION_CODE:
       return UTF8ToUTF16(GetCvn());
 
     case CREDIT_CARD_EXP_MONTH:
@@ skipping 40 matching lines @@
 
 bool FullWallet::HasRequiredAction(RequiredAction action) const {
   DCHECK(ActionAppliesToFullWallet(action));
   return std::find(required_actions_.begin(),
                    required_actions_.end(),
                    action) != required_actions_.end();
 }
 
 base::string16 FullWallet::TypeAndLastFourDigits() {
   CreditCard card;
-  card.SetRawInfo(CREDIT_CARD_NUMBER, GetInfo(CREDIT_CARD_NUMBER));
+  card.SetRawInfo(CREDIT_CARD_NUMBER,
+                  GetInfo(AutofillType(CREDIT_CARD_NUMBER)));
   return card.TypeAndLastFourDigits();
 }
 
 bool FullWallet::operator==(const FullWallet& other) const {
   if (expiration_month_ != other.expiration_month_)
     return false;
 
   if (expiration_year_ != other.expiration_year_)
     return false;
 
@@ skipping 83 matching lines @@
 }
 
 const std::string& FullWallet::GetCvn() {
   if (cvn_.empty())
     DecryptCardInfo();
   return cvn_;
 }
 
 }  // namespace wallet
 }  // namespace autofill