Autofill: Remove fax number completely.

chrome/browser/autofill/autofill_ie_toolbar_import_win.cc

Index: chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
index cec09d668c4e9747953c6cf8b29fdb111863c879..cb828492dd5cf82bd2b010894575de3d2565311b 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
@@ -101,9 +101,6 @@ struct {
   { 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" },
@@ -137,7 +134,6 @@ bool ImportSingleProfile(FormGroup* profile,
 
   // Phones need to be rebuilt.
   PhoneNumber::PhoneCombineHelper home(AutofillType::PHONE_HOME);

[Ilya Sherman, 2011/09/16 03:57:09]

I'd expect this not to compile, since the constructor no longer takes a
parameter.

[James Hawkins, 2011/09/16 04:23:21]

Done.

-  PhoneNumber::PhoneCombineHelper fax(AutofillType::PHONE_FAX);
 
   for (uint32 value_index = 0; value_index < key->ValueCount(); ++value_index) {
     std::wstring value_name;
@@ -149,15 +145,13 @@ bool ImportSingleProfile(FormGroup* profile,
     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

[Ilya Sherman, 2011/09/16 03:57:09]

nit: "the variables" -> "|home|", which should probably just be called "phone".

[James Hawkins, 2011/09/16 04:23:21]

Done.

       // 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)) {
+      if (!home.SetInfo(it->second, field_value))
         profile->SetInfo(it->second, field_value);
-      }
     }
   }
   // Now re-construct the phones if needed.
@@ -166,10 +160,6 @@ bool ImportSingleProfile(FormGroup* profile,
       home.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;
 }