Autofill: Remove fax number completely.

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 179 matching lines @@
     field->set_phone_part(AutofillField::PHONE_PREFIX);
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("phone-local-suffix")) {
     field->set_heuristic_type(PHONE_HOME_NUMBER);
     field->set_phone_part(AutofillField::PHONE_SUFFIX);
     return true;
   }
 
-  if (autocomplete_type == ASCIIToUTF16("fax-full")) {
-    field->set_heuristic_type(PHONE_FAX_WHOLE_NUMBER);
-    return true;
-  }
-
-  if (autocomplete_type == ASCIIToUTF16("fax-country-code")) {
-    field->set_heuristic_type(PHONE_FAX_COUNTRY_CODE);
-    return true;
-  }
-
-  if (autocomplete_type == ASCIIToUTF16("fax-national")) {
-    field->set_heuristic_type(PHONE_FAX_CITY_AND_NUMBER);
-    return true;
-  }
-
-  if (autocomplete_type == ASCIIToUTF16("fax-area-code")) {
-    field->set_heuristic_type(PHONE_FAX_CITY_CODE);
-    return true;
-  }
-
-  if (autocomplete_type == ASCIIToUTF16("fax-local")) {
-    field->set_heuristic_type(PHONE_FAX_NUMBER);
-    return true;
-  }
-
-  if (autocomplete_type == ASCIIToUTF16("fax-local-prefix")) {
-    field->set_heuristic_type(PHONE_FAX_NUMBER);
-    field->set_phone_part(AutofillField::PHONE_PREFIX);
-    return true;
-  }
-
-  if (autocomplete_type == ASCIIToUTF16("fax-local-suffix")) {
-    field->set_heuristic_type(PHONE_FAX_NUMBER);
-    field->set_phone_part(AutofillField::PHONE_SUFFIX);
-    return true;
-  }
-
   if (autocomplete_type == ASCIIToUTF16("cc-full-name")) {
     field->set_heuristic_type(CREDIT_CARD_NAME);
     return true;
   }
 
   if (autocomplete_type == ASCIIToUTF16("cc-number")) {
     field->set_heuristic_type(CREDIT_CARD_NUMBER);
     return true;
   }
 
@@ skipping 440 matching lines @@
     FieldTypeSet collapsed_field_types;
     for (FieldTypeSet::const_iterator it = field_types.begin();
          it != field_types.end();
          ++it) {
       // Since we currently only support US phone numbers, the (city code + main
       // digits) number is almost always identical to the whole phone number.
       // TODO(isherman): Improve this logic once we add support for
       // international numbers.
       if (*it == PHONE_HOME_CITY_AND_NUMBER)
         collapsed_field_types.insert(PHONE_HOME_WHOLE_NUMBER);
-      else if (*it == PHONE_FAX_CITY_AND_NUMBER)
-        collapsed_field_types.insert(PHONE_FAX_WHOLE_NUMBER);
       else
         collapsed_field_types.insert(AutofillType::GetEquivalentFieldType(*it));
     }
 
     // Capture the field's type, if it is unambiguous.
     AutofillFieldType field_type = UNKNOWN_TYPE;
     if (collapsed_field_types.size() == 1)
       field_type = *collapsed_field_types.begin();
 
     AutofillFieldType heuristic_type = field->heuristic_type();
@@ skipping 262 matching lines @@
   AutofillFieldType previous_type = UNKNOWN_TYPE;
 
   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 and fax number detection is also
-    // generally a little off.  Hence, ignore both field types as a signal here.
+    // evening phone number.  Our phone number detection is also generally a
+    // little off.  Hence, ignore this field type as a signal here.
     AutofillType::FieldTypeGroup current_type_group =
         AutofillType(current_type).group();
-    if (current_type_group == AutofillType::PHONE_HOME ||
-        current_type_group == AutofillType::PHONE_FAX)
+    if (current_type_group == AutofillType::PHONE_HOME)

[Ilya Sherman, 2011/09/15 03:47:08]

nit: You can get rid of the |current_type_group| variable as well, and just
inline the call into the if-stmt condition.

[James Hawkins, 2011/09/16 03:23:28]

Done.

       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
     // section.
     if (current_type == previous_type)
       already_saw_current_type = false;
 
     previous_type = current_type;
 
     if (current_type != UNKNOWN_TYPE && already_saw_current_type) {
       // We reached the end of a section, so start a new section.
       seen_types.clear();
       current_section = (*field)->unique_name();
     }
 
     seen_types.insert(current_type);
     (*field)->set_section(current_section);
   }
 }