Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/autofill_profile.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/autofill_profile.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <ostream>
@@ skipping 288 matching lines @@
 
 void AutofillProfile::SetMultiInfo(AutofillFieldType type,
                                    const std::vector<string16>& values) {
   switch (AutofillType(type).group()) {
     case AutofillType::NAME:
       CopyValuesToItems(type, values, &name_, NameInfo());
       break;
     case AutofillType::EMAIL:
       CopyValuesToItems(type, values, &email_, EmailInfo());
       break;
-    case AutofillType::PHONE_HOME:
+    case AutofillType::PHONE:
       CopyValuesToItems(type,
                         values,
                         &home_number_,
                         PhoneNumber(this));
       break;
     default:
       if (values.size() == 1) {
         SetInfo(type, values[0]);
       } else if (values.size() == 0) {
         SetInfo(type, string16());
@@ skipping 18 matching lines @@
 void AutofillProfile::GetMultiInfoImpl(AutofillFieldType type,
                                        bool canonicalize,
                                        std::vector<string16>* values) const {
   switch (AutofillType(type).group()) {
     case AutofillType::NAME:
       CopyItemsToValues(type, name_, canonicalize, values);
       break;
     case AutofillType::EMAIL:
       CopyItemsToValues(type, email_, canonicalize, values);
       break;
-    case AutofillType::PHONE_HOME:
+    case AutofillType::PHONE:
       CopyItemsToValues(type, home_number_, canonicalize, values);
       break;
     default:
       values->resize(1);
       (*values)[0] = GetInfo(type);
   }
 }
 
 // static
 bool AutofillProfile::SupportsMultiValue(AutofillFieldType type) {
   AutofillType::FieldTypeGroup group = AutofillType(type).group();
   return group == AutofillType::NAME ||
          group == AutofillType::EMAIL ||
-         group == AutofillType::PHONE_HOME;
+         group == AutofillType::PHONE;
 }
 
 const string16 AutofillProfile::Label() const {
   return label_;
 }
 
 const std::string AutofillProfile::CountryCode() const {
   return address_.country_code();
 }
 
@@ skipping 155 matching lines @@
   GetNonEmptyTypes(&types);
 
   for (FieldTypeSet::const_iterator iter = types.begin(); iter != types.end();
        ++iter) {
     if (*iter == NAME_FULL) {
       // Ignore the compound "full name" field type.  We are only interested in
       // comparing the constituent parts.  For example, if |this| has a middle
       // name saved, but |profile| lacks one, |profile| could still be a subset
       // of |this|.
       continue;
-    } else if (AutofillType(*iter).group() == AutofillType::PHONE_HOME) {
+    } else if (AutofillType(*iter).group() == AutofillType::PHONE) {
       // Phone numbers should be canonicalized prior to being compared.
       if (*iter != PHONE_HOME_WHOLE_NUMBER) {
         continue;
       } else if (!autofill_i18n::PhoneNumbersMatch(GetInfo(*iter),
                                                    profile.GetInfo(*iter),
                                                    CountryCode())) {
         return false;
       }
     } else if (StringToLowerASCII(GetInfo(*iter)) !=
                    StringToLowerASCII(profile.GetInfo(*iter))) {
@@ skipping 22 matching lines @@
 
       // GetMultiInfo always returns at least one element, even if the profile
       // has no data stored for this field type.
       if (existing_values.size() == 1 && existing_values.front().empty())
         existing_values.clear();
 
       FieldTypeGroup group = AutofillType(*iter).group();
       for (std::vector<string16>::iterator value_iter = new_values.begin();
            value_iter != new_values.end(); ++value_iter) {
         // Don't add duplicates.
-        if (group == AutofillType::PHONE_HOME) {
+        if (group == AutofillType::PHONE) {
           AddPhoneIfUnique(*value_iter, &existing_values);
         } else {
           std::vector<string16>::const_iterator existing_iter = std::find_if(
               existing_values.begin(), existing_values.end(),
               std::bind1st(CaseInsensitiveStringEquals(), *value_iter));
           if (existing_iter == existing_values.end())
             existing_values.insert(existing_values.end(), *value_iter);
         }
       }
       SetMultiInfo(*iter, existing_values);
@@ skipping 140 matching lines @@
   switch (AutofillType(type).group()) {
     case AutofillType::NAME:
       form_group = &name_[0];
       break;
     case AutofillType::EMAIL:
       form_group = &email_[0];
       break;
     case AutofillType::COMPANY:
       form_group = &company_;
       break;
-    case AutofillType::PHONE_HOME:
+    case AutofillType::PHONE:
       form_group = &home_number_[0];
       break;
     case AutofillType::ADDRESS_HOME:
       form_group = &address_;
       break;
     default:
       break;
   }
   return form_group;
 }
@@ skipping 22 matching lines @@
       << UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_CITY))
       << " "
       << UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_STATE))
       << " "
       << UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_ZIP))
       << " "
       << UTF16ToUTF8(profile.GetInfo(ADDRESS_HOME_COUNTRY))
       << " "
       << UTF16ToUTF8(MultiString(profile, PHONE_HOME_WHOLE_NUMBER));
 }