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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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 "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 97 matching lines @@
   return card_type == autofill::kVisaCard ||
          card_type == autofill::kMasterCard ||
          card_type == autofill::kDiscoverCard;
 }
 
 // Returns true if |input| should be shown when |field_type| has been requested.
 bool InputTypeMatchesFieldType(const DetailInput& input,
                                const AutofillType& field_type) {
   // If any credit card expiration info is asked for, show both month and year
   // inputs.
-  if (field_type.server_type() == CREDIT_CARD_EXP_4_DIGIT_YEAR ||
-      field_type.server_type() == CREDIT_CARD_EXP_2_DIGIT_YEAR ||
-      field_type.server_type() == CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR ||
-      field_type.server_type() == CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR ||
-      field_type.server_type() == CREDIT_CARD_EXP_MONTH) {
+  ServerFieldType server_type = field_type.GetStorableType();
+  if (server_type == CREDIT_CARD_EXP_4_DIGIT_YEAR ||
+      server_type == CREDIT_CARD_EXP_2_DIGIT_YEAR ||
+      server_type == CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR ||
+      server_type == CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR ||
+      server_type == CREDIT_CARD_EXP_MONTH) {
     return input.type == CREDIT_CARD_EXP_4_DIGIT_YEAR ||
            input.type == CREDIT_CARD_EXP_MONTH;
   }
 
-  if (field_type.server_type() == CREDIT_CARD_TYPE)
+  if (server_type == CREDIT_CARD_TYPE)
     return input.type == CREDIT_CARD_NUMBER;
 
-  return input.type == field_type.server_type();
+  // Check the groups to distinguish billing types from shipping ones.
+  AutofillType input_type = AutofillType(input.type);
+  return input_type.GetStorableType() == server_type &&
+         input_type.group() == field_type.group();
 }
 
 // Returns true if |input| in the given |section| should be used for a
 // site-requested |field|.
 bool DetailInputMatchesField(DialogSection section,
                              const DetailInput& input,
                              const AutofillField& field) {
   AutofillType field_type = field.Type();
 
   // The credit card name is filled from the billing section's data.
-  if (field_type.server_type() == CREDIT_CARD_NAME &&
+  if (field_type.GetStorableType() == CREDIT_CARD_NAME &&
       (section == SECTION_BILLING || section == SECTION_CC_BILLING)) {
     return input.type == NAME_BILLING_FULL;
   }
 
   return InputTypeMatchesFieldType(input, field_type);
 }
 
 bool IsCreditCardType(ServerFieldType type) {
   return AutofillType(type).group() == CREDIT_CARD;
 }
 
 // Returns true if |input| should be used to fill a site-requested |field| which
 // is notated with a "shipping" tag, for use when the user has decided to use
 // the billing address as the shipping address.
 bool DetailInputMatchesShippingField(const DetailInput& input,
                                      const AutofillField& field) {
   // Equivalent billing field type is used to support UseBillingAsShipping
   // usecase.
   ServerFieldType field_type =
-      AutofillType::GetEquivalentBillingFieldType(field.Type().server_type());
+      AutofillType::GetEquivalentBillingFieldType(
+          field.Type().GetStorableType());
 
   return InputTypeMatchesFieldType(input, AutofillType(field_type));
 }
 
 // Constructs |inputs| from template data.
 void BuildInputs(const DetailInput* input_template,
                  size_t template_size,
                  DetailInputs* inputs) {
   for (size_t i = 0; i < template_size; ++i) {
     const DetailInput* input = &input_template[i];
@@ skipping 357 matching lines @@
   if (!invoked_from_same_origin_) {
     GetMetricLogger().LogDialogSecurityMetric(
         GetDialogType(),
         AutofillMetrics::SECURITY_METRIC_CROSS_ORIGIN_FRAME);
   }
 
   // Determine what field types should be included in the dialog.
   bool has_types = false;
   bool has_sections = false;
   form_structure_.ParseFieldTypesFromAutocompleteAttributes(
-      FormStructure::PARSE_FOR_AUTOFILL_DIALOG, &has_types, &has_sections);
+      &has_types, &has_sections);
 
   // Fail if the author didn't specify autocomplete types.
   if (!has_types) {
     callback_.Run(NULL, std::string());
     delete this;
     return;
   }
 
   const DetailInput kEmailInputs[] = {
     { 1, EMAIL_ADDRESS, IDS_AUTOFILL_DIALOG_PLACEHOLDER_EMAIL },
@@ skipping 643 matching lines @@
     case SECTION_SHIPPING:
       return requested_shipping_fields_;
   }
 
   NOTREACHED();
   return requested_billing_fields_;
 }
 
 ui::ComboboxModel* AutofillDialogControllerImpl::ComboboxModelForAutofillType(
     ServerFieldType type) {
-  switch (AutofillType::GetEquivalentFieldType(type)) {
+  switch (type) {
     case CREDIT_CARD_EXP_MONTH:
       return &cc_exp_month_combobox_model_;
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       return &cc_exp_year_combobox_model_;
 
     case ADDRESS_HOME_COUNTRY:
+    case ADDRESS_BILLING_COUNTRY:
       return &country_combobox_model_;
 
     default:
       return NULL;
   }
 }
 
 ui::MenuModel* AutofillDialogControllerImpl::MenuModelForSection(
     DialogSection section) {
   SuggestionsMenuModel* model = SuggestionsMenuModelForSection(section);
@@ skipping 345 matching lines @@
     if (it != wallet_errors_.end()) {
       TypeErrorInputMap::const_iterator iter = it->second.find(type);
       if (iter != it->second.end()) {
         if (iter->second.second == value)
           return iter->second.first;
         it->second.erase(type);
       }
     }
   }
 
-  switch (AutofillType::GetEquivalentFieldType(type)) {
+  switch (AutofillType(type).GetStorableType()) {
     case EMAIL_ADDRESS:
       if (!value.empty() && !IsValidEmailAddress(value)) {
         return l10n_util::GetStringUTF16(
             IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_EMAIL_ADDRESS);
       }
       break;
 
     case CREDIT_CARD_NUMBER: {
       if (!value.empty()) {
         base::string16 message = CreditCardNumberValidityMessage(value);
@@ skipping 732 matching lines @@
   if (popup_controller_.get())
     return popup_controller_->HandleKeyPressEvent(event);
 
   return false;
 }
 
 bool AutofillDialogControllerImpl::RequestingCreditCardInfo() const {
   DCHECK_GT(form_structure_.field_count(), 0U);
 
   for (size_t i = 0; i < form_structure_.field_count(); ++i) {
-    if (IsCreditCardType(form_structure_.field(i)->Type().server_type()))
+    AutofillType type = form_structure_.field(i)->Type();
+    if (IsCreditCardType(type.GetStorableType()))
       return true;
   }
 
   return false;
 }
 
 bool AutofillDialogControllerImpl::TransmissionWillBeSecure() const {
   return source_url_.SchemeIs(chrome::kHttpsScheme);
 }
 
@@ skipping 439 matching lines @@
   // any of the fields.
   if (section == SECTION_SHIPPING)
     return cares_about_shipping_;
 
   return true;
 }
 
 void AutofillDialogControllerImpl::SetCvcResult(const string16& cvc) {
   for (size_t i = 0; i < form_structure_.field_count(); ++i) {
     AutofillField* field = form_structure_.field(i);
-    if (field->Type().server_type() == CREDIT_CARD_VERIFICATION_CODE) {
+    if (field->Type().GetStorableType() == CREDIT_CARD_VERIFICATION_CODE) {
       field->value = cvc;
       break;
     }
   }
 }
 
 string16 AutofillDialogControllerImpl::GetValueFromSection(
     DialogSection section,
     ServerFieldType type) {
   DCHECK(SectionIsActive(section));
@@ skipping 673 matching lines @@
     view_->GetUserInput(SECTION_CC_BILLING, &output);
     CreditCard card;
     GetBillingInfoFromOutputs(output, &card, NULL, NULL);
     backing_last_four = card.TypeAndLastFourDigits();
   }
   AutofillCreditCardBubbleController::ShowGeneratedCardUI(
       web_contents(), backing_last_four, full_wallet_->TypeAndLastFourDigits());
 }
 
 }  // namespace autofill