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

components/autofill/core/browser/personal_data_manager.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/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 241 matching lines @@
   for (size_t i = 0; i < form.field_count(); ++i) {
     const AutofillField* field = form.field(i);
     base::string16 value = CollapseWhitespace(field->value, false);
 
     // If we don't know the type of the field, or the user hasn't entered any
     // information into the field, then skip it.
     if (!field->IsFieldFillable() || value.empty())
       continue;
 
     AutofillType field_type = field->Type();
-    ServerFieldType server_field_type = field_type.server_type();
+    ServerFieldType server_field_type = field_type.GetStorableType();
     FieldTypeGroup group(field_type.group());
 
     // There can be multiple email fields (e.g. in the case of 'confirm email'
     // fields) but they must all contain the same value, else the profile is
     // invalid.
     if (server_field_type == EMAIL_ADDRESS) {
       if (types_seen.count(server_field_type) &&
           imported_profile->GetRawInfo(EMAIL_ADDRESS) != value) {
         imported_profile.reset();
         break;
@@ skipping 337 matching lines @@
         if (multi_values[i].empty())
           continue;
 
         base::string16 profile_value_lower_case(
             StringToLowerASCII(multi_values[i]));
         base::string16 field_value_lower_case(
             StringToLowerASCII(field_contents));
         // Phone numbers could be split in US forms, so field value could be
         // either prefix or suffix of the phone.
         bool matched_phones = false;
-        if ((type.server_type() == PHONE_HOME_NUMBER ||
-             type.server_type() == PHONE_BILLING_NUMBER) &&
+        if (type.GetStorableType() == PHONE_HOME_NUMBER &&
             !field_value_lower_case.empty() &&
             profile_value_lower_case.find(field_value_lower_case) !=
                 base::string16::npos) {
           matched_phones = true;
         }
 
         // Suggest variants of the profile that's already been filled in.
         if (matched_phones ||
             profile_value_lower_case == field_value_lower_case) {
           for (size_t j = 0; j < multi_values.size(); ++j) {
             if (!multi_values[j].empty()) {
               values->push_back(multi_values[j]);
               guid_pairs->push_back(GUIDPair(profile->guid(), j));
             }
           }
 
           // We've added all the values for this profile so move on to the
           // next.
           break;
         }
       }
     }
   }
 
   if (!field_is_autofilled) {
     AutofillProfile::CreateInferredLabels(
         &matched_profiles, &other_field_types,
-        type.server_type(), 1, labels);
+        type.GetStorableType(), 1, labels);
   } else {
     // No sub-labels for previously filled fields.
     labels->resize(values->size());
   }
 
   // No icons for profile suggestions.
   icons->resize(values->size());
 }
 
 void PersonalDataManager::GetCreditCardSuggestions(
@@ skipping 11 matching lines @@
   const std::vector<CreditCard*>& credit_cards = GetCreditCards();
   for (std::vector<CreditCard*>::const_iterator iter = credit_cards.begin();
        iter != credit_cards.end(); ++iter) {
     CreditCard* credit_card = *iter;
 
     // The value of the stored data for this field type in the |credit_card|.
     base::string16 creditcard_field_value =
         credit_card->GetInfo(type, app_locale_);
     if (!creditcard_field_value.empty() &&
         StartsWith(creditcard_field_value, field_contents, false)) {
-      if (type.server_type() == CREDIT_CARD_NUMBER)
+      if (type.GetStorableType() == CREDIT_CARD_NUMBER)
         creditcard_field_value = credit_card->ObfuscatedNumber();
 
       base::string16 label;
       if (credit_card->number().empty()) {
         // If there is no CC number, return name to show something.
         label =
             credit_card->GetInfo(AutofillType(CREDIT_CARD_NAME), app_locale_);
       } else {
         label = kCreditCardPrefix;
         label.append(credit_card->LastFourDigits());
@@ skipping 333 matching lines @@
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }
 
 }  // namespace autofill