Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/phone_number.cc

Index: chrome/browser/autofill/phone_number.cc
diff --git a/chrome/browser/autofill/phone_number.cc b/chrome/browser/autofill/phone_number.cc
index 5303067acec2d8236a01fa0923fbc2ccac1cdd5d..cf0545ca0cf921f5489b74233e01413eabd07b55 100644
--- a/chrome/browser/autofill/phone_number.cc
+++ b/chrome/browser/autofill/phone_number.cc
@@ -23,16 +23,6 @@ const size_t kPhoneNumberLength = 7;
 // The number of digits in an area code.
 const size_t kPhoneCityCodeLength = 3;
 
-const AutofillType::FieldTypeSubGroup kAutofillPhoneTypes[] = {
-  AutofillType::PHONE_NUMBER,
-  AutofillType::PHONE_CITY_CODE,
-  AutofillType::PHONE_COUNTRY_CODE,
-  AutofillType::PHONE_CITY_AND_NUMBER,
-  AutofillType::PHONE_WHOLE_NUMBER,
-};
-
-const int kAutofillPhoneLength = arraysize(kAutofillPhoneTypes);
-
 void StripPunctuation(string16* number) {
   RemoveChars(*number, kPhoneNumberSeparators, number);
 }
@@ -96,9 +86,8 @@ string16 PhoneNumber::GetInfo(AutofillFieldType type) const {
 }
 
 void PhoneNumber::SetInfo(AutofillFieldType type, const string16& value) {
-  FieldTypeSubGroup subgroup = AutofillType(type).subgroup();
-  if (subgroup != AutofillType::PHONE_CITY_AND_NUMBER &&
-      subgroup != AutofillType::PHONE_WHOLE_NUMBER) {
+  if (type != PHONE_HOME_CITY_AND_NUMBER &&
+      type != PHONE_HOME_WHOLE_NUMBER) {
     // Only full phone numbers should be set directly.  The remaining field
     // field types are read-only.
     return;