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

components/autofill/content/browser/wallet/wallet_address.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/wallet_address.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
+#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/state_names.h"
 
 namespace autofill {
 namespace wallet {
 
 // Server specified type for address with complete details.
 const char kFullAddress[] = "FULL";
 
 namespace {
 
@@ skipping 231 matching lines @@
 
 string16 Address::DisplayNameDetail() const {
 #if defined(OS_ANDROID)
   // TODO(aruslan): improve this stub implementation.
   return address_line_1();
 #else
   return string16();
 #endif
 }
 
-string16 Address::GetInfo(AutofillFieldType type,
+string16 Address::GetInfo(const AutofillType& type,
                           const std::string& app_locale) const {
-  switch (AutofillType::GetEquivalentFieldType(type)) {
+  switch (AutofillType::GetEquivalentFieldType(type.server_type())) {
     case NAME_FULL:
       return recipient_name();
 
     case ADDRESS_HOME_LINE1:
       return address_line_1();
 
     case ADDRESS_HOME_LINE2:
       return address_line_2();
 
     case ADDRESS_HOME_CITY:
@@ skipping 35 matching lines @@
 bool Address::operator==(const Address& other) const {
   return object_id_ == other.object_id_ && EqualsIgnoreID(other);
 }
 
 bool Address::operator!=(const Address& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet
 }  // namespace autofill