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

components/autofill/core/browser/autofill_profile.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/core/browser/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 15 matching lines @@
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 namespace {
 
 // Like |AutofillType::GetEquivalentFieldType()|, but also returns |NAME_FULL|
 // for first, middle, and last name field types.
 NativeFieldType GetEquivalentFieldTypeCollapsingNames(NativeFieldType type) {
-  if (type == NAME_FIRST || type == NAME_MIDDLE || type == NAME_LAST ||
-      type == NAME_MIDDLE_INITIAL)
+  NativeFieldType equivalent_type =
+      AutofillType(type).GetEquivalentNativeType();

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

this fn seems a little bit hoop-jumpy. Would it be the same to do:

AutofillType autofill_type = AutofillType(type);
if (type.group() == NAME)
  return NAME_FULL;

return autofill_type.GetEquivalentNativeType();

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

It's not quite the same unless we also check for NAME_BILLING in the if-stmt. 
Let me know whether you prefer that (as done in the newer patch set) or the way
that it was here.

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

I think the original way is fine now that I understand GetEquivalentNativeType 
better.

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

Done.

+
+  if (AutofillType(equivalent_type).group() == NAME)
     return NAME_FULL;
 
-  return AutofillType::GetEquivalentFieldType(type);
+  return equivalent_type;
 }
 
 // Fills |distinguishing_fields| with a list of fields to use when creating
 // labels that can help to distinguish between two profiles. Draws fields from
 // |suggested_fields| if it is non-NULL; otherwise returns a default list.
 // If |suggested_fields| is non-NULL, does not include |excluded_field| in the
 // list. Otherwise, |excluded_field| is ignored, and should be set to
 // |UNKNOWN_TYPE| by convention. The resulting list of fields is sorted in
 // decreasing order of importance.
 void GetFieldsForDistinguishingProfiles(
@@ skipping 66 matching lines @@
       accumulate += ASCIIToUTF16(" ");
     accumulate += values[i];
   }
   return accumulate;
 }
 
 base::string16 GetFormGroupInfo(const FormGroup& form_group,
                                 const AutofillType& type,
                                 const std::string& app_locale) {
   return app_locale.empty() ?
-      form_group.GetRawInfo(type.native_type()) :
+      form_group.GetRawInfo(type.GetEquivalentNativeType()) :
       form_group.GetInfo(type, app_locale);
 }
 
 template <class T>
 void CopyValuesToItems(NativeFieldType type,
                        const std::vector<base::string16>& values,
                        std::vector<T>* form_group_items,
                        const T& prototype) {
   form_group_items->resize(values.size(), prototype);
   for (size_t i = 0; i < form_group_items->size(); ++i) {
@@ skipping 130 matching lines @@
 void AutofillProfile::GetMatchingTypes(
     const base::string16& text,
     const std::string& app_locale,
     NativeFieldTypeSet* matching_types) const {
   FormGroupList info = FormGroups();
   for (FormGroupList::const_iterator it = info.begin(); it != info.end(); ++it)
     (*it)->GetMatchingTypes(text, app_locale, matching_types);
 }
 
 base::string16 AutofillProfile::GetRawInfo(NativeFieldType type) const {
-  NativeFieldType return_type = AutofillType::GetEquivalentFieldType(type);
-  const FormGroup* form_group = FormGroupForType(AutofillType(return_type));
+  const FormGroup* form_group = FormGroupForType(AutofillType(type));
   if (!form_group)
     return base::string16();
 
-  return form_group->GetRawInfo(return_type);
+  return form_group->GetRawInfo(type);
 }
 
 void AutofillProfile::SetRawInfo(NativeFieldType type,
                                  const base::string16& value) {
   FormGroup* form_group = MutableFormGroupForType(AutofillType(type));
   if (form_group)
     form_group->SetRawInfo(type, CollapseWhitespace(value, false));
 }
 
 base::string16 AutofillProfile::GetInfo(const AutofillType& type,
                                         const std::string& app_locale) const {
-  NativeFieldType return_type =
-      AutofillType::GetEquivalentFieldType(type.native_type());
-  const FormGroup* form_group = FormGroupForType(AutofillType(return_type));
+  const FormGroup* form_group = FormGroupForType(type);
   if (!form_group)
     return base::string16();
 
-  return form_group->GetInfo(AutofillType(return_type), app_locale);
+  return form_group->GetInfo(type, app_locale);
 }
 
 bool AutofillProfile::SetInfo(const AutofillType& type,
                               const base::string16& value,
                               const std::string& app_locale) {
   FormGroup* form_group = MutableFormGroupForType(type);
   if (!form_group)
     return false;
 
   return
@@ skipping 44 matching lines @@
 }
 
 void AutofillProfile::FillFormField(const AutofillField& field,
                                     size_t variant,
                                     const std::string& app_locale,
                                     FormFieldData* field_data) const {
   AutofillType type = field.Type();
   DCHECK_NE(CREDIT_CARD, type.group());
   DCHECK(field_data);
 
-  if (type.native_type() == PHONE_HOME_NUMBER ||
-      type.native_type() == PHONE_BILLING_NUMBER) {
+  if (type.GetEquivalentNativeType() == PHONE_HOME_NUMBER) {
     FillPhoneNumberField(field, variant, app_locale, field_data);
   } else if (field_data->form_control_type == "select-one") {
     FillSelectControl(type, app_locale, field_data);
   } else {
     std::vector<base::string16> values;
     GetMultiInfo(type, app_locale, &values);
     if (variant >= values.size()) {
       // If the variant is unavailable, bail.  This case is reachable, for
       // example if Sync updates a profile during the filling process.
       return;
@@ skipping 523 matching lines @@
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_STATE))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_ZIP))
       << " "
       << UTF16ToUTF8(profile.GetRawInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }
 
 }  // namespace autofill