Autofill: Remove fax number completely.

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"
@@ skipping 41 matching lines @@
 
 PhoneNumber::PhoneNumber(const PhoneNumber& number) : FormGroup() {
   *this = number;
 }
 
 PhoneNumber::~PhoneNumber() {}
 
 PhoneNumber& PhoneNumber::operator=(const PhoneNumber& number) {
   if (this == &number)
     return *this;
+
   phone_group_ = number.phone_group_;
   number_ = number.number_;
   profile_ = number.profile_;
   cached_parsed_phone_ = number.cached_parsed_phone_;
   return *this;
 }
 
 void PhoneNumber::GetSupportedTypes(FieldTypeSet* supported_types) const {
   supported_types->insert(GetWholeNumberType());
   supported_types->insert(GetNumberType());
@@ skipping 71 matching lines @@
   return NormalizePhone();
 }
 
 void PhoneNumber::GetMatchingTypes(const string16& text,
                                    FieldTypeSet* matching_types) const {
   string16 stripped_text = text;
   StripPunctuation(&stripped_text);
   FormGroup::GetMatchingTypes(stripped_text, matching_types);
 
   // For US numbers, also compare to the three-digit prefix and the four-digit
-  // suffix, since websites often split numbers into these two fields.
+  // suffix, since web sites often split numbers into these two fields.
   string16 number = GetCanonicalizedInfo(GetNumberType());
   if (locale() == "US" && number.size() == (kPrefixLength + kSuffixLength)) {
     string16 prefix = number.substr(kPrefixOffset, kPrefixLength);
     string16 suffix = number.substr(kSuffixOffset, kSuffixLength);
     if (text == prefix || text == suffix)
       matching_types->insert(GetNumberType());
   }
 
   string16 whole_number = GetCanonicalizedInfo(GetWholeNumberType());
   if (!whole_number.empty() &&
@@ skipping 20 matching lines @@
 
   return profile_->CountryCode();
 }
 
 void PhoneNumber::UpdateCacheIfNeeded() const {
   if (!number_.empty() && cached_parsed_phone_.GetLocale() != locale())
     cached_parsed_phone_ = autofill_i18n::PhoneObject(number_, locale());
 }
 
 AutofillFieldType PhoneNumber::GetNumberType() const {
-  if (phone_group_ == AutofillType::PHONE_HOME)
-    return PHONE_HOME_NUMBER;
-  else if (phone_group_ == AutofillType::PHONE_FAX)
-    return PHONE_FAX_NUMBER;
-  else
-    NOTREACHED();
-  return UNKNOWN_TYPE;
+  return PHONE_HOME_NUMBER;
 }
 
 AutofillFieldType PhoneNumber::GetCityCodeType() const {
-  if (phone_group_ == AutofillType::PHONE_HOME)
-    return PHONE_HOME_CITY_CODE;
-  else if (phone_group_ == AutofillType::PHONE_FAX)
-    return PHONE_FAX_CITY_CODE;
-  else
-    NOTREACHED();
-  return UNKNOWN_TYPE;
+  return PHONE_HOME_CITY_CODE;
 }
 
 AutofillFieldType PhoneNumber::GetCountryCodeType() const {
-  if (phone_group_ == AutofillType::PHONE_HOME)
-    return PHONE_HOME_COUNTRY_CODE;
-  else if (phone_group_ == AutofillType::PHONE_FAX)
-    return PHONE_FAX_COUNTRY_CODE;
-  else
-    NOTREACHED();
-  return UNKNOWN_TYPE;
+  return PHONE_HOME_COUNTRY_CODE;
 }
 
 AutofillFieldType PhoneNumber::GetCityAndNumberType() const {
-  if (phone_group_ == AutofillType::PHONE_HOME)
-    return PHONE_HOME_CITY_AND_NUMBER;
-  else if (phone_group_ == AutofillType::PHONE_FAX)
-    return PHONE_FAX_CITY_AND_NUMBER;
-  else
-    NOTREACHED();
-  return UNKNOWN_TYPE;
+  return PHONE_HOME_CITY_AND_NUMBER;
 }
 
 AutofillFieldType PhoneNumber::GetWholeNumberType() const {
-  if (phone_group_ == AutofillType::PHONE_HOME)
-    return PHONE_HOME_WHOLE_NUMBER;
-  else if (phone_group_ == AutofillType::PHONE_FAX)
-    return PHONE_FAX_WHOLE_NUMBER;
-  else
-    NOTREACHED();
-  return UNKNOWN_TYPE;
+  return PHONE_HOME_WHOLE_NUMBER;
 }
 
 PhoneNumber::PhoneCombineHelper::PhoneCombineHelper(
     AutofillType::FieldTypeGroup phone_group)
     : phone_group_(phone_group) {
 }
 
 PhoneNumber::PhoneCombineHelper::~PhoneCombineHelper() {
 }
 
@@ skipping 40 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();
 }