Autofill: Remove fax number completely.

chrome/browser/autofill/autofill_manager_unittest.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 <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
@@ skipping 86 matching lines @@
     credit_cards_->push_back(credit_card);
   }
 
  private:
   void CreateTestAutofillProfiles(ScopedVector<AutofillProfile>* profiles) {
     AutofillProfile* profile = new AutofillProfile;
     autofill_test::SetProfileInfo(profile, "Elvis", "Aaron",
                                   "Presley", "theking@gmail.com", "RCA",
                                   "3734 Elvis Presley Blvd.", "Apt. 10",
                                   "Memphis", "Tennessee", "38116", "USA",
-                                  "12345678901", "");
+                                  "12345678901");
     profile->set_guid("00000000-0000-0000-0000-000000000001");
     profiles->push_back(profile);
     profile = new AutofillProfile;
     autofill_test::SetProfileInfo(profile, "Charles", "Hardin",
                                   "Holley", "buddy@gmail.com", "Decca",
                                   "123 Apple St.", "unit 6", "Lubbock",
-                                  "Texas", "79401", "USA", "23456789012",
-                                  "");
+                                  "Texas", "79401", "USA", "23456789012");
     profile->set_guid("00000000-0000-0000-0000-000000000002");
     profiles->push_back(profile);
     profile = new AutofillProfile;
-    autofill_test::SetProfileInfo(profile, "", "", "", "", "", "", "",
-                                  "", "", "", "", "", "");
+    autofill_test::SetProfileInfo(profile, "", "", "", "", "", "", "", "", "",
+                                  "", "", "");
     profile->set_guid("00000000-0000-0000-0000-000000000003");
     profiles->push_back(profile);
   }
 
   void CreateTestCreditCards(ScopedVector<CreditCard>* credit_cards) {
     CreditCard* credit_card = new CreditCard;
     autofill_test::SetCreditCardInfo(credit_card, "Elvis Presley",
                                      "4234 5678 9012 3456",  // Visa
                                      "04", "2012");
     credit_card->set_guid("00000000-0000-0000-0000-000000000004");
@@ skipping 50 matching lines @@
   autofill_test::CreateTestFormField(
       "Postal Code", "zipcode", "", "text", &field);
   form->fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Country", "country", "", "text", &field);
   form->fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Phone Number", "phonenumber", "", "tel", &field);
   form->fields.push_back(field);
   autofill_test::CreateTestFormField(
-      "Fax", "fax", "", "text", &field);
-  form->fields.push_back(field);
-  autofill_test::CreateTestFormField(
       "Email", "email", "", "email", &field);
   form->fields.push_back(field);
 }
 
 // Populates |form| with data corresponding to a simple credit card form.
 // Note that this actually appends fields to the form data, which can be useful
 // for building up more complex test forms.
 void CreateTestCreditCardFormData(FormData* form,
                                   bool is_https,
                                   bool use_month_type) {
@@ skipping 76 matching lines @@
                       const char* first,
                       const char* middle,
                       const char* last,
                       const char* address1,
                       const char* address2,
                       const char* city,
                       const char* state,
                       const char* postal_code,
                       const char* country,
                       const char* phone,
-                      const char* fax,
                       const char* email,
                       const char* name_on_card,
                       const char* card_number,
                       const char* expiration_month,
                       const char* expiration_year,
                       bool has_address_fields,
                       bool has_credit_card_fields,
                       bool use_month_type) {
   // The number of fields in the address and credit card forms created above.
-  const size_t kAddressFormSize = 12;
+  const size_t kAddressFormSize = 11;
   const size_t kCreditCardFormSize = use_month_type ? 3 : 4;
 
   EXPECT_EQ(expected_page_id, page_id);
   EXPECT_EQ(ASCIIToUTF16("MyForm"), filled_form.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), filled_form.method);
   if (has_credit_card_fields) {
     EXPECT_EQ(GURL("https://myform.com/form.html"), filled_form.origin);
     EXPECT_EQ(GURL("https://myform.com/submit.html"), filled_form.action);
   } else {
     EXPECT_EQ(GURL("http://myform.com/form.html"), filled_form.origin);
@@ skipping 22 matching lines @@
     ExpectFilledField("City", "city", city, "text",
                       filled_form.fields[5]);
     ExpectFilledField("State", "state", state, "text",
                       filled_form.fields[6]);
     ExpectFilledField("Postal Code", "zipcode", postal_code, "text",
                       filled_form.fields[7]);
     ExpectFilledField("Country", "country", country, "text",
                       filled_form.fields[8]);
     ExpectFilledField("Phone Number", "phonenumber", phone, "tel",
                       filled_form.fields[9]);
-    ExpectFilledField("Fax", "fax", fax, "text",
+    ExpectFilledField("Email", "email", email, "email",
                       filled_form.fields[10]);
-    ExpectFilledField("Email", "email", email, "email",
-                      filled_form.fields[11]);
   }
 
   if (has_credit_card_fields) {
     size_t offset = has_address_fields? kAddressFormSize : 0;
     ExpectFilledField("Name on Card", "nameoncard", name_on_card, "text",
                       filled_form.fields[offset + 0]);
     ExpectFilledField("Card Number", "cardnumber", card_number, "text",
                       filled_form.fields[offset + 1]);
     if (use_month_type) {
       std::string exp_year = expiration_year;
@@ skipping 12 matching lines @@
     }
   }
 }
 
 void ExpectFilledAddressFormElvis(int page_id,
                                   const FormData& filled_form,
                                   int expected_page_id,
                                   bool has_credit_card_fields) {
   ExpectFilledForm(page_id, filled_form, expected_page_id, "Elvis", "Aaron",
                    "Presley", "3734 Elvis Presley Blvd.", "Apt. 10", "Memphis",
-                   "Tennessee", "38116", "United States", "12345678901", "",
+                   "Tennessee", "38116", "United States", "12345678901",
                    "theking@gmail.com", "", "", "", "", true,
                    has_credit_card_fields, false);
 }
 
 void ExpectFilledCreditCardFormElvis(int page_id,
                                      const FormData& filled_form,
                                      int expected_page_id,
                                      bool has_address_fields) {
   ExpectFilledForm(page_id, filled_form, expected_page_id,
-                   "", "", "", "", "", "", "", "", "", "", "", "",
+                   "", "", "", "", "", "", "", "", "", "", "",
                    "Elvis Presley", "4234567890123456", "04", "2012",
                    has_address_fields, true, false);
 }
 
 void ExpectFilledCreditCardYearMonthWithYearMonth(int page_id,
                                               const FormData& filled_form,
                                               int expected_page_id,
                                               bool has_address_fields,
                                               const char* year,
                                               const char* month) {
   ExpectFilledForm(page_id, filled_form, expected_page_id,
-                   "", "", "", "", "", "", "", "", "", "", "", "",
+                   "", "", "", "", "", "", "", "", "", "", "",
                    "Miku Hatsune", "4234567890654321", month, year,
                    has_address_fields, true, true);
 }
 
 class TestAutofillManager : public AutofillManager {
  public:
   TestAutofillManager(TabContentsWrapper* tab_contents,
                       TestPersonalDataManager* personal_manager)
       : AutofillManager(tab_contents, personal_manager),
         autofill_enabled_(true) {
@@ skipping 952 matching lines @@
 // filling an already filled field.
 TEST_F(AutofillManagerTest, GetFieldSuggestionsWithDuplicateValues) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   // |profile| will be owned by the mock PersonalDataManager.
   AutofillProfile* profile = new AutofillProfile;
-  autofill_test::SetProfileInfo(profile, "Elvis", "", "", "", "",
-                                "", "", "", "", "", "", "", "");
+  autofill_test::SetProfileInfo(profile, "Elvis", "", "", "", "", "", "", "",
+                                "", "", "", "");
   profile->set_guid("00000000-0000-0000-0000-000000000101");
   autofill_manager_->AddProfile(profile);
 
   FormField& field = form.fields[0];
   field.is_autofilled = true;
   field.value = ASCIIToUTF16("Elvis");
   GetAutofillSuggestions(form, field);
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
@@ skipping 22 matching lines @@
 TEST_F(AutofillManagerTest, GetFieldSuggestionsForMultiValuedProfileUnfilled) {
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   // |profile| will be owned by the mock PersonalDataManager.
   AutofillProfile* profile = new AutofillProfile;
   autofill_test::SetProfileInfo(profile, "Elvis", "", "Presley", "me@x.com", "",
-                                "", "", "", "", "", "", "", "");
+                                "", "", "", "", "", "", "");
   profile->set_guid("00000000-0000-0000-0000-000000000101");
   std::vector<string16> multi_values(2);
   multi_values[0] = ASCIIToUTF16("Elvis Presley");
   multi_values[1] = ASCIIToUTF16("Elena Love");
   profile->SetMultiInfo(NAME_FULL, multi_values);
   test_personal_data_->ClearAutofillProfiles();
   autofill_manager_->AddProfile(profile);
 
   {
     // Get the first name field.
@@ skipping 624 matching lines @@
   FillAutofillFormData(
       kDefaultPageID, form, *form.fields.begin(),
       autofill_manager_->PackGUIDs(empty, guid));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Address");
     ExpectFilledForm(page_id, results, kDefaultPageID,
-                     "Elvis", "", "", "", "", "", "", "", "", "", "", "",
-                     "", "", "", "", true, true, false);
+                     "Elvis", "", "", "", "", "", "", "", "", "", "", "", "",
+                     "", "", true, true, false);
   }
 
   // Now fill the credit card data.
   const int kPageID2 = 2;
   GUIDPair guid2("00000000-0000-0000-0000-000000000004", 0);
   FillAutofillFormData(
       kPageID2, form, form.fields.back(),
       autofill_manager_->PackGUIDs(guid2, empty));
 
   page_id = 0;
@@ skipping 14 matching lines @@
   const int kPageID3 = 3;
   FillAutofillFormData(
       kPageID3, form, *form.fields.rbegin(),
       autofill_manager_->PackGUIDs(guid2, empty));
 
   page_id = 0;
   EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   {
     SCOPED_TRACE("Credit card 2");
     ExpectFilledForm(page_id, results, kPageID3,
-                   "", "", "", "", "", "", "", "", "", "", "", "",
-                   "", "", "", "2012", true, true, false);
+                     "", "", "", "", "", "", "", "", "", "", "", "", "", "",
+                     "2012", true, true, false);
   }
 }
 
 // Test that we correctly fill a phone number split across multiple fields.
 TEST_F(AutofillManagerTest, FillPhoneNumber) {
   // In one form, rely on the maxlength attribute to imply phone number parts.
   // In the other form, rely on the autocompletetype attribute.
   FormData form_with_maxlength;
   form_with_maxlength.name = ASCIIToUTF16("MyMaxlengthPhoneForm");
   form_with_maxlength.method = ASCIIToUTF16("POST");
@@ skipping 137 matching lines @@
       autofill_manager_->PackGUIDs(empty, guid));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutofillFormDataFilledMessage(&page_id, &results));
   ExpectFilledAddressFormElvis(page_id, results, kDefaultPageID, false);
 }
 
 // Test that we can still fill a form when a field has been added to it.
 TEST_F(AutofillManagerTest, FormChangesAddField) {
-  // The offset of the fax field in the address form.
-  const int kFaxFieldOffset = 10;
+  // The offset of the phone field in the address form.
+  const int kPhoneFieldOffset = 9;
 
   // Set up our form data.
   FormData form;
   CreateTestAddressFormData(&form);
 
-  // Remove the fax field -- we'll add it back later.
-  std::vector<FormField>::iterator pos = form.fields.begin() + kFaxFieldOffset;
+  // Remove the phone field -- we'll add it back later.
+  std::vector<FormField>::iterator pos =
+      form.fields.begin() + kPhoneFieldOffset;
   FormField field = *pos;
   pos = form.fields.erase(pos);
 
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
 
   // Now, after the call to |FormsSeen|, we restore the field before filling.
   form.fields.insert(pos, field);
 
   GUIDPair guid("00000000-0000-0000-0000-000000000001", 0);
@@ skipping 463 matching lines @@
     autofill_test::SetProfileInfo(profile,
                                   StringPrintf("John%d", i).c_str(),
                                   "",
                                   StringPrintf("Doe%d", i).c_str(),
                                   StringPrintf("JohnDoe%d@somesite.com",
                                                i).c_str(),
                                   "",
                                   StringPrintf("%d 1st st.", i).c_str(),
                                   "",
                                   "Memphis", "Tennessee", "38116", "USA",
-                                  StringPrintf("650234%04d", i).c_str(),
-                                  "");
+                                  StringPrintf("650234%04d", i).c_str());
     profile->set_guid(
         StringPrintf("00000000-0000-0000-0001-00000000%04d", i).c_str());
     test_personal_data_->AddProfile(profile);
   }
   FormData form;
   CreateTestAddressFormData(&form);
   ASSERT_LT(3U, form.fields.size());
   form.fields[0].value = ASCIIToUTF16("6502340001");
   form.fields[1].value = ASCIIToUTF16("John1");
   form.fields[2].value = ASCIIToUTF16("12345");
@@ skipping 10 matching lines @@
   const FieldTypeSet& possible_types1 =
       form_structure.field(1)->possible_types();
   EXPECT_EQ(1U, possible_types1.size());
   EXPECT_TRUE(possible_types1.find(NAME_FIRST) != possible_types1.end());
   const FieldTypeSet& possible_types2 =
       form_structure.field(2)->possible_types();
   EXPECT_EQ(1U, possible_types2.size());
   EXPECT_TRUE(possible_types2.find(UNKNOWN_TYPE) !=
               possible_types2.end());
 }