Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/autofill_type.cc

Index: chrome/browser/autofill/autofill_type.cc
diff --git a/chrome/browser/autofill/autofill_type.cc b/chrome/browser/autofill/autofill_type.cc
index 8aefd1c91807a3910429d1b172a0647cc905a368..1efe6a95c31856ab2052362d48465abc7a4de991 100644
--- a/chrome/browser/autofill/autofill_type.cc
+++ b/chrome/browser/autofill/autofill_type.cc
@@ -8,128 +8,6 @@
 
 #include "base/logging.h"
 
-namespace {
-
-AutofillType::AutofillTypeDefinition kAutofillTypeDefinitions[] = {
-  // NO_SERVER_DATA
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  // UNKNOWN_TYPE
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  // EMPTY_TYPE
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-
-  // NAME_FIRST
-  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
-  // NAME_MIDDLE
-  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
-  // NAME_LAST
-  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
-  // NAME_MIDDLE_INITIAL
-  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
-  // NAME_FULL
-  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
-  // NAME_SUFFIX
-  { AutofillType::NAME, AutofillType::NO_SUBGROUP },
-
-  // EMAIL_ADDRESS
-  { AutofillType::EMAIL, AutofillType::NO_SUBGROUP },
-
-  // PHONE_HOME_NUMBER
-  { AutofillType::PHONE_HOME, AutofillType::PHONE_NUMBER },
-  // PHONE_HOME_CITY_CODE
-  { AutofillType::PHONE_HOME, AutofillType::PHONE_CITY_CODE },
-  // PHONE_HOME_COUNTRY_CODE
-  { AutofillType::PHONE_HOME, AutofillType::PHONE_COUNTRY_CODE },
-  // PHONE_HOME_CITY_AND_NUMBER
-  { AutofillType::PHONE_HOME, AutofillType::PHONE_CITY_AND_NUMBER },
-  // PHONE_HOME_WHOLE_NUMBER
-  { AutofillType::PHONE_HOME, AutofillType::PHONE_WHOLE_NUMBER },
-
-  // Work phone numbers (values [15,19]) are deprecated.
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-
-  // Fax numbers (values [20,24]) are deprecated.
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-
-  // Cell phone numbers (values [25, 29]) are deprecated.
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-
-  // ADDRESS_HOME_LINE1
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_LINE1 },
-  // ADDRESS_HOME_LINE2
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_LINE2 },
-  // ADDRESS_HOME_APT_NUM
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_APT_NUM },
-  // ADDRESS_HOME_CITY
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_CITY },
-  // ADDRESS_HOME_STATE
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_STATE },
-  // ADDRESS_HOME_ZIP
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_ZIP },
-  // ADDRESS_HOME_COUNTRY
-  { AutofillType::ADDRESS_HOME, AutofillType::ADDRESS_COUNTRY },
-
-  // ADDRESS_BILLING_LINE1
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_LINE1 },
-  // ADDRESS_BILLING_LINE2
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_LINE2 },
-  // ADDRESS_BILLING_APT_NUM
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_APT_NUM },
-  // ADDRESS_BILLING_CITY
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_CITY },
-  // ADDRESS_BILLING_STATE
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_STATE },
-  // ADDRESS_BILLING_ZIP
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_ZIP },
-  // ADDRESS_BILLING_COUNTRY
-  { AutofillType::ADDRESS_BILLING, AutofillType::ADDRESS_COUNTRY },
-
-  // ADDRESS_SHIPPING values [44,50] are deprecated.
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-  { AutofillType::NO_GROUP, AutofillType::NO_SUBGROUP },
-
-  // CREDIT_CARD_NAME
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_NUMBER
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_EXP_MONTH
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_EXP_2_DIGIT_YEAR
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_EXP_4_DIGIT_YEAR
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_TYPE
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-  // CREDIT_CARD_VERIFICATION_CODE
-  { AutofillType::CREDIT_CARD, AutofillType::NO_SUBGROUP },
-
-  // COMPANY_NAME
-  { AutofillType::COMPANY, AutofillType::NO_SUBGROUP },
-};
-
-}  // namespace
-
 AutofillType::AutofillType(AutofillFieldType field_type) {
   if ((field_type < NO_SERVER_DATA || field_type >= MAX_VALID_FIELD_TYPE) ||
       (field_type >= 15 && field_type <= 19) ||
@@ -155,11 +33,60 @@ AutofillFieldType AutofillType::field_type() const {
 }
 
 FieldTypeGroup AutofillType::group() const {
-  return kAutofillTypeDefinitions[field_type_].group;
-}
+  switch (field_type_) {
+    case NAME_FIRST:
+    case NAME_MIDDLE:
+    case NAME_LAST:
+    case NAME_MIDDLE_INITIAL:
+    case NAME_FULL:
+    case NAME_SUFFIX:
+      return NAME;
+
+    case EMAIL_ADDRESS:
+      return EMAIL;
 
-FieldTypeSubGroup AutofillType::subgroup() const {
-  return kAutofillTypeDefinitions[field_type_].subgroup;
+    case PHONE_HOME_NUMBER:
+    case PHONE_HOME_CITY_CODE:
+    case PHONE_HOME_COUNTRY_CODE:
+    case PHONE_HOME_CITY_AND_NUMBER:
+    case PHONE_HOME_WHOLE_NUMBER:
+      return PHONE;
+
+    case ADDRESS_HOME_LINE1:
+    case ADDRESS_HOME_LINE2:
+    case ADDRESS_HOME_APT_NUM:
+    case ADDRESS_HOME_CITY:
+    case ADDRESS_HOME_STATE:
+    case ADDRESS_HOME_ZIP:
+    case ADDRESS_HOME_COUNTRY:
+      return ADDRESS_HOME;
+
+    case ADDRESS_BILLING_LINE1:
+    case ADDRESS_BILLING_LINE2:
+    case ADDRESS_BILLING_APT_NUM:
+    case ADDRESS_BILLING_CITY:
+    case ADDRESS_BILLING_STATE:
+    case ADDRESS_BILLING_ZIP:
+    case ADDRESS_BILLING_COUNTRY:
+      return ADDRESS_BILLING;
+
+    case CREDIT_CARD_NAME:
+    case CREDIT_CARD_NUMBER:
+    case CREDIT_CARD_EXP_MONTH:
+    case CREDIT_CARD_EXP_2_DIGIT_YEAR:
+    case CREDIT_CARD_EXP_4_DIGIT_YEAR:
+    case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR:
+    case CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR:
+    case CREDIT_CARD_TYPE:
+    case CREDIT_CARD_VERIFICATION_CODE:
+      return CREDIT_CARD;
+
+    case COMPANY_NAME:
+      return COMPANY;
+
+    default:
+      return NO_GROUP;
+  }
 }
 
 // static