[Autofill] Add a separate enumeration for HTML field type hints.

components/autofill/core/browser/autofill_type.h

Index: components/autofill/core/browser/autofill_type.h
diff --git a/components/autofill/core/browser/autofill_type.h b/components/autofill/core/browser/autofill_type.h
index 7d77538d0dde2f1aba4257af4a05124209649a35..ffc9db502aa1f84f2d3ca5157a015c2ed92a5bf4 100644
--- a/components/autofill/core/browser/autofill_type.h
+++ b/components/autofill/core/browser/autofill_type.h
@@ -16,31 +16,54 @@ namespace autofill {
 class AutofillType {
  public:
   explicit AutofillType(NativeFieldType field_type);
+  AutofillType(HtmlFieldType field_type, HtmlFieldMode mode);
   AutofillType(const AutofillType& autofill_type);
   AutofillType& operator=(const AutofillType& autofill_type);
 
-  // TODO(isherman): Audit all uses of this method.
-  NativeFieldType native_type() const { return native_type_; }
   FieldTypeGroup group() const;
 
-  // Maps |field_type| to a field type that can be directly stored in a profile
-  // (in the sense that it makes sense to call |AutofillProfile::SetInfo()| with
-  // the returned field type as the first parameter).
-  static NativeFieldType GetEquivalentFieldType(NativeFieldType field_type);
+  // Returns true if both the |native_type_| and the |html_type_| are set to
+  // their respective enum's unknown value.
+  bool IsUnknown() const;
+
+  // Maps |this| type to a field type that can be directly stored in an Autofill
+  // data model (in the sense that it makes sense to call
+  // |AutofillDataModel::SetRawInfo()| with the returned field type as the first
+  // parameter).  Returns UNKNOWN_TYPE if there is no direct mapping of |this|
+  // type to an equivalent storable type.
+  NativeFieldType GetEquivalentNativeType() const;

[Evan Stade, 2013/08/05 18:47:24]

while "equivalent" was probably never the easiest to understand name, this is
now even more confusing because it sounds like it's just mapping from html_type_
to native_type_. However it's also possible to spit out a native type that
doesn't match native_type_. GetStorableNativeType? GetChromeAutofillType?

I'm also a bit worried that it will be easy to use GetEquivalent or
GetApproximate when the other is more appropriate, since in most cases it does
the same thing. Is there a way you can make that mixup less likely?

[Ilya Sherman, 2013/08/06 05:05:39]

Done.
Does the added explanation in the comment for GetApproximateStorableType() help?

[Evan Stade, 2013/08/06 18:39:59]

I was hoping for an api change which would make it more apparent. The new
comment indicates GetApproximate is useful for comparisons between fields, could
you perhaps make it a function on FormField which is an alternative to Type()?

Is there ever a time when using GetApproximateStorableType() instead of
GetStorableType() would lead to a bug? I can't see one off hand. If not you
could just nix GetStorableType().

[Ilya Sherman, 2013/08/06 23:04:56]

The sort of thing that could lead to a bug is e.g. calling
SetInfo(HTML_TYPE_STREET_ADDRESS) and having the full address end up as line 1
of the resulting address.

Let's actually punt this issue to a separate CL, as it's pretty subtle, and easy
enough to get wrong.  I'll just drop support for 'street-address' from this CL
for now, which is the only type for which approximate vs. exact matters.  SG?

+
+  // Maps |this| type to a field type that can be directly stored in an Autofill
+  // data model (in the sense that it makes sense to call
+  // |AutofillDataModel::SetRawInfo()| with the returned field type as the first
+  // parameter).  Unlike GetEquivalentNativeType(), this method returns the
+  // nearest storable type if there is no direct mapping of |this| type to an
+  // equivalent storable type.

[Evan Stade, 2013/08/05 18:47:24]

it sounds like this guarantees you won't get UNKOWN_TYPE out of this fn, but I
don't think that's correct.

[Ilya Sherman, 2013/08/06 05:05:39]

Done.

+  NativeFieldType GetApproximateNativeFieldType() const;
+
+  // Serializes |this| type to a string.
+  std::string ToString() const;
 
   // Maps |field_type| to a field type from ADDRESS_BILLING FieldTypeGroup if
   // field type is an Address type.
+  // TODO(isherman): This method is only used by the
+  // AutofillDialogControllerImpl class.  Consider moving it to a more focused
+  // location.
   static NativeFieldType GetEquivalentBillingFieldType(
       NativeFieldType field_type);
 
-  // Utilities for serializing and deserializing a |NativeFieldType|.
-  // TODO(isherman): This should probably serialize an HTML type as well.
-  //                 Audit all uses of these functions.
-  static std::string FieldTypeToString(NativeFieldType field_type);
+  // TODO(isherman): This method is only used be a single test class.  Move the
+  // logic into there or something, eh?
   static NativeFieldType StringToFieldType(const std::string& str);
 
  private:
+  // The native field type, or UNKNOWN_TYPE if unset.
   NativeFieldType native_type_;
+
+  // The HTML autocomplete field type and mode hints, or HTML_TYPE_UNKNOWN and
+  // HTML_MODE_NONE if unset.
+  HtmlFieldType html_type_;
+  HtmlFieldMode html_mode_;
 };
 
 }  // namespace autofill