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

components/autofill/core/browser/phone_number.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_CORE_BROWSER_PHONE_NUMBER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
-#include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/form_group.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 
 namespace autofill {
 
 class AutofillProfile;
 
 // A form group that stores phone number information.
 class PhoneNumber : public FormGroup {
  public:
   explicit PhoneNumber(AutofillProfile* profile);
   PhoneNumber(const PhoneNumber& number);
   virtual ~PhoneNumber();
 
   PhoneNumber& operator=(const PhoneNumber& number);
 
   void set_profile(AutofillProfile* profile) { profile_ = profile; }
 
   // FormGroup implementation:
-  virtual void GetMatchingTypes(const base::string16& text,
-                                const std::string& app_locale,
-                                FieldTypeSet* matching_types) const OVERRIDE;
-  virtual base::string16 GetRawInfo(AutofillFieldType type) const OVERRIDE;
-  virtual void SetRawInfo(AutofillFieldType type,
+  virtual void GetMatchingTypes(
+      const base::string16& text,
+      const std::string& app_locale,
+      ServerFieldTypeSet* matching_types) const OVERRIDE;
+  virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE;
+  virtual void SetRawInfo(ServerFieldType type,
                           const base::string16& value) OVERRIDE;
-  virtual base::string16 GetInfo(AutofillFieldType type,
+  virtual base::string16 GetInfo(const AutofillType& type,
                            const std::string& app_locale) const OVERRIDE;
-  virtual bool SetInfo(AutofillFieldType type,
+  virtual bool SetInfo(const AutofillType& type,
                        const base::string16& value,
                        const std::string& app_locale) OVERRIDE;
 
   // Size and offset of the prefix and suffix portions of phone numbers.
   static const size_t kPrefixOffset = 0;
   static const size_t kPrefixLength = 3;
   static const size_t kSuffixOffset = 3;
   static const size_t kSuffixLength = 4;
 
   // The class used to combine home phone parts into a whole number.
   class PhoneCombineHelper {
    public:
     PhoneCombineHelper();
     ~PhoneCombineHelper();
 
     // If |type| is a phone field type, saves the |value| accordingly and
     // returns true.  For all other field types returs false.
-    bool SetInfo(AutofillFieldType type, const base::string16& value);
+    bool SetInfo(const AutofillType& type, const base::string16& value);
 
     // Parses the number built up from pieces stored via SetInfo() according to
     // the specified |profile|'s country code, falling back to the given
     // |app_locale| if the |profile| has no associated country code.  Returns
     // true if parsing was successful, false otherwise.
     bool ParseNumber(const AutofillProfile& profile,
                      const std::string& app_locale,
                      base::string16* value);
 
     // Returns true if both |phone_| and |whole_number_| are empty.
     bool IsEmpty() const;
 
    private:
     base::string16 country_;
     base::string16 city_;
     base::string16 phone_;
     base::string16 whole_number_;
   };
 
  private:
   // FormGroup:
-  virtual void GetSupportedTypes(FieldTypeSet* supported_types) const OVERRIDE;
+  virtual void GetSupportedTypes(
+      ServerFieldTypeSet* supported_types) const OVERRIDE;
 
   // Updates the cached parsed number if the profile's region has changed
   // since the last time the cache was updated.
   void UpdateCacheIfNeeded(const std::string& app_locale) const;
 
   // The phone number.
   base::string16 number_;
   // Profile which stores the region used as hint when normalizing the number.
   const AutofillProfile* profile_;  // WEAK
 
   // Cached number.
   mutable i18n::PhoneObject cached_parsed_phone_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PHONE_NUMBER_H_