Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/autofill_type.h

Index: chrome/browser/autofill/autofill_type.h
diff --git a/chrome/browser/autofill/autofill_type.h b/chrome/browser/autofill/autofill_type.h
index b543aca2a7e8f3a259b48461a4da92394d37ac88..263b5099f841fdccda4861d0bab4e905b1d0a7f5 100644
--- a/chrome/browser/autofill/autofill_type.h
+++ b/chrome/browser/autofill/autofill_type.h
@@ -24,41 +24,16 @@ class AutofillType {
     COMPANY,
     ADDRESS_HOME,
     ADDRESS_BILLING,
-    PHONE_HOME,
+    PHONE,
     CREDIT_CARD,
   };
 
-  enum FieldTypeSubGroup {
-    NO_SUBGROUP,
-    // Address subgroups.
-    ADDRESS_LINE1,
-    ADDRESS_LINE2,
-    ADDRESS_APT_NUM,
-    ADDRESS_CITY,
-    ADDRESS_STATE,
-    ADDRESS_ZIP,
-    ADDRESS_COUNTRY,
-
-    // Phone subgroups.
-    PHONE_NUMBER,
-    PHONE_CITY_CODE,
-    PHONE_COUNTRY_CODE,
-    PHONE_CITY_AND_NUMBER,
-    PHONE_WHOLE_NUMBER
-  };
-
-  struct AutofillTypeDefinition {
-    FieldTypeGroup group;
-    FieldTypeSubGroup subgroup;
-  };
-
   explicit AutofillType(AutofillFieldType field_type);
   AutofillType(const AutofillType& autofill_type);
   AutofillType& operator=(const AutofillType& autofill_type);
 
   AutofillFieldType field_type() const;
   FieldTypeGroup group() const;
-  FieldTypeSubGroup subgroup() 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
@@ -74,7 +49,6 @@ class AutofillType {
 };
 
 typedef AutofillType::FieldTypeGroup FieldTypeGroup;
-typedef AutofillType::FieldTypeSubGroup FieldTypeSubGroup;
 typedef std::set<AutofillFieldType> FieldTypeSet;
 typedef std::map<string16, AutofillFieldType> FieldTypeMap;