Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/phone_number.cc

 // Copyright (c) 2011 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/autofill/phone_number.h"
 
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 
 namespace {
 
 const char16 kPhoneNumberSeparators[] = { ' ', '.', '(', ')', '-', 0 };
 
 // The number of digits in a phone number.
 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);
 }
 
 }  // namespace
 
 PhoneNumber::PhoneNumber(AutofillProfile* profile)
     : profile_(profile) {
 }
 
@@ skipping 43 matching lines @@
   if (type == PHONE_HOME_CITY_AND_NUMBER) {
     string16 city_and_local(cached_parsed_phone_.GetCityCode());
     city_and_local.append(cached_parsed_phone_.GetNumber());
     return city_and_local;
   }
 
   return string16();
 }
 
 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;
   }
 
   number_ = value;
   cached_parsed_phone_ = autofill_i18n::PhoneObject(number_, locale());
 }
 
 // Normalize phones if |type| is a whole number:
@@ skipping 116 matching lines @@
       country_, city_, phone_,
       locale,
       (country_.empty() ?
           autofill_i18n::NATIONAL : autofill_i18n::INTERNATIONAL),
       value);
 }
 
 bool PhoneNumber::PhoneCombineHelper::IsEmpty() const {
   return phone_.empty() && whole_number_.empty();
 }