Remove FieldTypeSubGroups from the AutofillType class.

chrome/browser/autofill/form_structure.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/form_structure.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 914 matching lines @@
     for (std::vector<AutofillField*>::iterator field = fields_->begin();
          field != fields_->end(); ++field) {
       const AutofillFieldType current_type =
           AutofillType::GetEquivalentFieldType((*field)->type());
 
       bool already_saw_current_type = seen_types.count(current_type) > 0;
 
       // Forms often ask for multiple phone numbers -- e.g. both a daytime and
       // evening phone number.  Our phone number detection is also generally a
       // little off.  Hence, ignore this field type as a signal here.
-      if (AutofillType(current_type).group() == AutofillType::PHONE_HOME)
+      if (AutofillType(current_type).group() == AutofillType::PHONE)
         already_saw_current_type = false;
 
       // Some forms have adjacent fields of the same type.  Two common examples:
       //  * Forms with two email fields, where the second is meant to "confirm"
       //    the first.
       //  * Forms with a <select> menu for states in some countries, and a
       //    freeform <input> field for states in other countries.  (Usually,
       //    only one of these two will be visible for any given choice of
       //    country.)
       // Generally, adjacent fields of the same type belong in the same logical
@@ skipping 19 matching lines @@
   for (std::vector<AutofillField*>::iterator field = fields_->begin();
        field != fields_->end(); ++field) {
     AutofillType::FieldTypeGroup field_type_group =
         AutofillType((*field)->type()).group();
     if (field_type_group == AutofillType::CREDIT_CARD)
       (*field)->set_section((*field)->section() + ASCIIToUTF16("-cc"));
     else
       (*field)->set_section((*field)->section() + ASCIIToUTF16("-default"));
   }
 }