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

components/autofill/content/browser/wallet/wallet_address.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "components/autofill/core/browser/field_types.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace autofill {
 
 class AutofillProfile;
+class AutofillType;
 
 namespace wallet {
 
 // TODO(ahutter): This address is a lot like
 // components/autofill/core/browser/address.h.  There should be a super
 // class that both extend from to clean up duplicated code. See
 // http://crbug.com/164463.
 
 // Address contains various address fields that have been populated from the
 // user's Online Wallet. It is loosely modeled as a subet of the OASIS
@@ skipping 52 matching lines @@
 
   // Returns a string that summarizes this address, suitable for display to
   // the user.
   base::string16 DisplayName() const;
 
   // Returns a string that could be used as a sub-label, suitable for display
   // to the user together with DisplayName().
   base::string16 DisplayNameDetail() const;
 
   // Returns data appropriate for |type|.
-  base::string16 GetInfo(AutofillFieldType type,
-                   const std::string& app_locale) const;
+  base::string16 GetInfo(const AutofillType& type,
+                         const std::string& app_locale) const;
 
   const std::string& country_name_code() const { return country_name_code_; }
   const base::string16& recipient_name() const { return recipient_name_; }
   const base::string16& address_line_1() const { return address_line_1_; }
   const base::string16& address_line_2() const { return address_line_2_; }
   const base::string16& locality_name() const { return locality_name_; }
   const base::string16& administrative_area_name() const {
     return administrative_area_name_;
   }
   const base::string16& postal_code_number() const {
@@ skipping 86 matching lines @@
   bool is_complete_address_;
 
   // This class is intentionally copyable.
   DISALLOW_ASSIGN(Address);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_