Autofill: Remove fax number completely.

chrome/browser/autofill/autofill_ie_toolbar_import_win.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_ie_toolbar_import_win.h"
 
 #include <stddef.h>
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 83 matching lines @@
 } profile_reg_values[] = {
   { NAME_FIRST,                    L"name_first" },
   { NAME_MIDDLE,                   L"name_middle" },
   { NAME_LAST,                     L"name_last" },
   { NAME_SUFFIX,                   L"name_suffix" },
   { EMAIL_ADDRESS,                 L"email" },
   { COMPANY_NAME,                  L"company_name" },
   { PHONE_HOME_NUMBER,             L"phone_home_number" },
   { PHONE_HOME_CITY_CODE,          L"phone_home_city_code" },
   { PHONE_HOME_COUNTRY_CODE,       L"phone_home_country_code" },
-  { PHONE_FAX_NUMBER,              L"phone_fax_number" },
-  { PHONE_FAX_CITY_CODE,           L"phone_fax_city_code" },
-  { PHONE_FAX_COUNTRY_CODE,        L"phone_fax_country_code" },
   { ADDRESS_HOME_LINE1,            L"address_home_line1" },
   { ADDRESS_HOME_LINE2,            L"address_home_line2" },
   { ADDRESS_HOME_CITY,             L"address_home_city" },
   { ADDRESS_HOME_STATE,            L"address_home_state" },
   { ADDRESS_HOME_ZIP,              L"address_home_zip" },
   { ADDRESS_HOME_COUNTRY,          L"address_home_country" },
   { ADDRESS_BILLING_LINE1,         L"address_billing_line1" },
   { ADDRESS_BILLING_LINE2,         L"address_billing_line2" },
   { ADDRESS_BILLING_CITY,          L"address_billing_city" },
   { ADDRESS_BILLING_STATE,         L"address_billing_state" },
@@ skipping 12 matching lines @@
 bool ImportSingleProfile(FormGroup* profile,
                          RegKey* key,
                          const RegToFieldMap& reg_to_field ) {
   DCHECK(profile != NULL);
   if (!key->Valid())
     return false;
 
   bool has_non_empty_fields = false;
 
   // Phones need to be rebuilt.
-  PhoneNumber::PhoneCombineHelper home(AutofillType::PHONE_HOME);
-  PhoneNumber::PhoneCombineHelper fax(AutofillType::PHONE_FAX);
+  PhoneNumber::PhoneCombineHelper phone;
 
   for (uint32 value_index = 0; value_index < key->ValueCount(); ++value_index) {
     std::wstring value_name;
     if (key->ReadName(value_index, &value_name) != ERROR_SUCCESS)
       continue;
     RegToFieldMap::const_iterator it = reg_to_field.find(value_name);
     if (it == reg_to_field.end())
       continue;  // This field is not imported.
     string16 field_value = ReadAndDecryptValue(key, value_name.c_str());
     if (!field_value.empty()) {
       has_non_empty_fields = true;
-      if (it->second == CREDIT_CARD_NUMBER) {
+      if (it->second == CREDIT_CARD_NUMBER)
         field_value = DecryptCCNumber(field_value);
-      }
-      // We need to store phone data in the variables, before building the whole
-      // number at the end. The rest of the fields are set "as is".
-      if (!home.SetInfo(it->second, field_value) &&
-          !fax.SetInfo(it->second, field_value)) {
+
+      // We need to store phone data in |phone| before building the whole number
+      // at the end. The rest of the fields are set "as is".
+      if (!phone.SetInfo(it->second, field_value))
         profile->SetInfo(it->second, field_value);
-      }
     }
   }
   // Now re-construct the phones if needed.
   string16 constructed_number;
-  if (!home.IsEmpty() &&
-      home.ParseNumber(std::string("US"), &constructed_number)) {
+  if (!phone.IsEmpty() &&
+      phone.ParseNumber(std::string("US"), &constructed_number)) {
     profile->SetCanonicalizedInfo(PHONE_HOME_WHOLE_NUMBER, constructed_number);
   }
-  if (!fax.IsEmpty() &&
-      fax.ParseNumber(std::string("US"), &constructed_number)) {
-    profile->SetCanonicalizedInfo(PHONE_FAX_WHOLE_NUMBER, constructed_number);
-  }
 
   return has_non_empty_fields;
 }
 
 // Imports profiles from the IE toolbar and stores them. Asynchronous
 // if PersonalDataManager has not been loaded yet. Deletes itself on completion.
 class AutofillImporter : public PersonalDataManagerObserver {
  public:
   explicit AutofillImporter(PersonalDataManager* personal_data_manager)
     : personal_data_manager_(personal_data_manager) {
@@ skipping 93 matching lines @@
 
 bool ImportAutofillDataWin(PersonalDataManager* pdm) {
   // In incognito mode we do not have PDM - and we should not import anything.
   if (!pdm)
     return false;
   AutofillImporter *importer = new AutofillImporter(pdm);
   // importer will self delete.
   return importer->ImportProfiles();
 }