Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/address.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/address.h"
 
 #include <stddef.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_country.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
 
 namespace {
 
 const char16 kAddressSplitChars[] = {'-', ',', '#', '.', ' ', 0};
 
-const AutofillType::FieldTypeSubGroup kAutofillAddressTypes[] = {
-  AutofillType::ADDRESS_LINE1,
-  AutofillType::ADDRESS_LINE2,
-  AutofillType::ADDRESS_CITY,
-  AutofillType::ADDRESS_STATE,
-  AutofillType::ADDRESS_ZIP,
-  AutofillType::ADDRESS_COUNTRY,
-};
-
-const int kAutofillAddressLength = arraysize(kAutofillAddressTypes);
-
 // Returns the country code corresponding to |country|, which should be a
 // localized country name.
 std::string ToCountryCode(const string16& country) {
   std::string app_locale = AutofillCountry::ApplicationLocale();
   return AutofillCountry::GetCountryCode(country, app_locale);
 }
 
 }  // namespace
 
 Address::Address() {}
@@ skipping 42 matching lines @@
   if (type ==  ADDRESS_HOME_ZIP)
     return zip_code_;
 
   if (type == ADDRESS_HOME_COUNTRY)
     return Country();
 
   return string16();
 }
 
 void Address::SetInfo(AutofillFieldType type, const string16& value) {
-  FieldTypeSubGroup subgroup = AutofillType(type).subgroup();
-  if (subgroup == AutofillType::ADDRESS_LINE1)
+  type = AutofillType::GetEquivalentFieldType(type);
+  if (type == ADDRESS_HOME_LINE1)
     line1_ = value;
-  else if (subgroup == AutofillType::ADDRESS_LINE2)
+  else if (type == ADDRESS_HOME_LINE2)
     line2_ = value;
-  else if (subgroup == AutofillType::ADDRESS_CITY)
+  else if (type == ADDRESS_HOME_CITY)
     city_ = value;
-  else if (subgroup == AutofillType::ADDRESS_STATE)
+  else if (type == ADDRESS_HOME_STATE)
     state_ = value;
-  else if (subgroup == AutofillType::ADDRESS_COUNTRY)
+  else if (type == ADDRESS_HOME_COUNTRY)
     country_code_ = ToCountryCode(value);
-  else if (subgroup == AutofillType::ADDRESS_ZIP)
+  else if (type == ADDRESS_HOME_ZIP)
     zip_code_ = value;
   else
     NOTREACHED();
 }
 
 void Address::GetMatchingTypes(const string16& text,
                                FieldTypeSet* matching_types) const {
   FormGroup::GetMatchingTypes(text, matching_types);
 
   // Check to see if the |text| canonicalized as a country name is a match.
   std::string country_code = ToCountryCode(text);
   if (!country_code.empty() && country_code_ == country_code)
     matching_types->insert(ADDRESS_HOME_COUNTRY);
 }
 
 string16 Address::Country() const {
   if (country_code().empty())
     return string16();
 
   std::string app_locale = AutofillCountry::ApplicationLocale();
   return AutofillCountry(country_code(), app_locale).name();
 }