Autofill: Remove fax number completely.

chrome/browser/autofill/form_structure_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 "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 269 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Phone");
   field.name = ASCIIToUTF16("phone");
   form.fields.push_back(field);
 
-  field.label = ASCIIToUTF16("Fax");
-  field.name = ASCIIToUTF16("fax");
-  form.fields.push_back(field);
-
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("City");
   field.name = ASCIIToUTF16("city");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Zip code");
   field.name = ASCIIToUTF16("zipcode");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = ASCIIToUTF16("submit");
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
-  ASSERT_EQ(9U, form_structure->field_count());
-  ASSERT_EQ(8U, form_structure->autofill_count());
+  ASSERT_EQ(8U, form_structure->field_count());
+  ASSERT_EQ(7U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
   // Phone.
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
       form_structure->field(3)->heuristic_type());
-  // Fax.
-  EXPECT_EQ(PHONE_FAX_WHOLE_NUMBER, form_structure->field(4)->heuristic_type());
   // Address.
-  EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(5)->heuristic_type());
+  EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(4)->heuristic_type());
   // City.
-  EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(6)->heuristic_type());
+  EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(5)->heuristic_type());
   // Zip.
-  EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(7)->heuristic_type());
+  EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(6)->heuristic_type());
   // Submit.
-  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(8)->heuristic_type());
+  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(7)->heuristic_type());
 }
 
 // Verify that we can correctly process the |autocompletetype| attribute.
 TEST(FormStructureTest, HeuristicsAutocompletetype) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormField field;
   field.form_control_type = ASCIIToUTF16("text");
@@ skipping 41 matching lines @@
   field.autocomplete_type = ASCIIToUTF16("phone-local");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field2");
   field.autocomplete_type = ASCIIToUTF16("phone-local-prefix");
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("field3");
-  field.autocomplete_type = ASCIIToUTF16("fax-local-suffix");
+  field.autocomplete_type = ASCIIToUTF16("phone-local-suffix");
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(3U, form_structure->field_count());
   EXPECT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(PHONE_HOME_NUMBER, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(AutofillField::IGNORED, form_structure->field(0)->phone_part());
   EXPECT_EQ(PHONE_HOME_NUMBER, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(AutofillField::PHONE_PREFIX,
             form_structure->field(1)->phone_part());
-  EXPECT_EQ(PHONE_FAX_NUMBER, form_structure->field(2)->heuristic_type());
+  EXPECT_EQ(PHONE_HOME_NUMBER, form_structure->field(2)->heuristic_type());
   EXPECT_EQ(AutofillField::PHONE_SUFFIX,
             form_structure->field(2)->phone_part());
 }
 
 // If at least one field includes the |autocompletetype| attribute, we should
 // not try to apply any other heuristics.
 TEST(FormStructureTest, AutocompletetypeOverridesOtherHeuristics) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
@@ skipping 322 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Phone");
   field.name = string16();
   form.fields.push_back(field);
 
-  field.label = ASCIIToUTF16("Fax");
-  field.name = string16();
-  form.fields.push_back(field);
-
   field.label = ASCIIToUTF16("Address");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Zip code");
   field.name = string16();
   form.fields.push_back(field);
 
   field.label = string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = ASCIIToUTF16("submit");
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
-  ASSERT_EQ(9U, form_structure->field_count());
-  ASSERT_EQ(8U, form_structure->autofill_count());
+  ASSERT_EQ(8U, form_structure->field_count());
+  ASSERT_EQ(7U, form_structure->autofill_count());
 
   // First name.
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   // Last name.
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
   // Phone.
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
       form_structure->field(3)->heuristic_type());
-  // Fax.
-  EXPECT_EQ(PHONE_FAX_WHOLE_NUMBER, form_structure->field(4)->heuristic_type());
   // Address.
-  EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(5)->heuristic_type());
+  EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(4)->heuristic_type());
   // Address Line 2.
-  EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(6)->heuristic_type());
+  EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(5)->heuristic_type());
   // Zip.
-  EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(7)->heuristic_type());
+  EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(6)->heuristic_type());
   // Submit.
-  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(8)->heuristic_type());
+  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(7)->heuristic_type());
 }
 
 TEST(FormStructureTest, HeuristicsCreditCardInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormField field;
   field.form_control_type = ASCIIToUTF16("text");
 
@@ skipping 672 matching lines @@
   form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(PHONE_HOME_WHOLE_NUMBER);
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
   field.form_control_type = ASCIIToUTF16("select-one");
   form.fields.push_back(field);
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
-
-  field.label = ASCIIToUTF16("Fax");
-  field.name = ASCIIToUTF16("fax");
-  field.form_control_type = ASCIIToUTF16("tel");
-  form.fields.push_back(field);
-  possible_field_types.push_back(FieldTypeSet());
-  possible_field_types.back().insert(PHONE_FAX_WHOLE_NUMBER);
   form_structure.reset(new FormStructure(form));
 
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
   FieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_LINE2);
   available_field_types.insert(ADDRESS_HOME_COUNTRY);
   available_field_types.insert(ADDRESS_BILLING_LINE1);
   available_field_types.insert(ADDRESS_BILLING_LINE2);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(PHONE_HOME_WHOLE_NUMBER);
-  available_field_types.insert(PHONE_FAX_WHOLE_NUMBER);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\" "
-            "formsignature=\"7641728017676399335\" autofillused=\"false\" "
-            "datapresent=\"144200830e\">"
+            "formsignature=\"8736493185895608956\" autofillused=\"false\" "
+            "datapresent=\"144200030e\">"
             "<field signature=\"3763331450\" autofilltype=\"3\"/>"
             "<field signature=\"3494530716\" autofilltype=\"5\"/>"
             "<field signature=\"1029417091\" autofilltype=\"9\"/>"
             "<field signature=\"466116101\" autofilltype=\"14\"/>"
             "<field signature=\"2799270304\" autofilltype=\"36\"/>"
-            "<field signature=\"1876771436\" autofilltype=\"24\"/>"
             "</autofillupload>",
             encoded_xml);
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\" "
-            "formsignature=\"7641728017676399335\" autofillused=\"true\" "
-            "datapresent=\"144200830e\">"
+            "formsignature=\"8736493185895608956\" autofillused=\"true\" "
+            "datapresent=\"144200030e\">"
             "<field signature=\"3763331450\" autofilltype=\"3\"/>"
             "<field signature=\"3494530716\" autofilltype=\"5\"/>"
             "<field signature=\"1029417091\" autofilltype=\"9\"/>"
             "<field signature=\"466116101\" autofilltype=\"14\"/>"
             "<field signature=\"2799270304\" autofilltype=\"36\"/>"
-            "<field signature=\"1876771436\" autofilltype=\"24\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // Add 2 address fields - this should be still a valid form.
   for (size_t i = 0; i < 2; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     field.form_control_type = ASCIIToUTF16("text");
     form.fields.push_back(field);
     possible_field_types.push_back(FieldTypeSet());
     possible_field_types.back().insert(ADDRESS_HOME_LINE1);
     possible_field_types.back().insert(ADDRESS_HOME_LINE2);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE1);
     possible_field_types.back().insert(ADDRESS_BILLING_LINE2);
   }
 
   form_structure.reset(new FormStructure(form));
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\" "
-            "formsignature=\"12226592129574322128\" autofillused=\"false\" "
-            "datapresent=\"144200830e\">"
+            "formsignature=\"7816485729218079147\" autofillused=\"false\" "
+            "datapresent=\"144200030e\">"
             "<field signature=\"3763331450\" autofilltype=\"3\"/>"
             "<field signature=\"3494530716\" autofilltype=\"5\"/>"
             "<field signature=\"1029417091\" autofilltype=\"9\"/>"
             "<field signature=\"466116101\" autofilltype=\"14\"/>"
             "<field signature=\"2799270304\" autofilltype=\"36\"/>"
-            "<field signature=\"1876771436\" autofilltype=\"24\"/>"
             "<field signature=\"509334676\" autofilltype=\"30\"/>"
             "<field signature=\"509334676\" autofilltype=\"31\"/>"
             "<field signature=\"509334676\" autofilltype=\"37\"/>"
             "<field signature=\"509334676\" autofilltype=\"38\"/>"
             "<field signature=\"509334676\" autofilltype=\"30\"/>"
             "<field signature=\"509334676\" autofilltype=\"31\"/>"
             "<field signature=\"509334676\" autofilltype=\"37\"/>"
             "<field signature=\"509334676\" autofilltype=\"38\"/>"
             "</autofillupload>",
             encoded_xml);
@@ skipping 88 matching lines @@
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
             " formsignature=\"6402244543831589061\" autofillused=\"false\""
             " datapresent=\"1540000240\">"
             "<field signature=\"1089846351\" autofilltype=\"1\"/>"
             "<field signature=\"2404144663\" autofilltype=\"1\"/>"
             "<field signature=\"420638584\" autofilltype=\"1\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // All supported non-credit card types available.
-  // datapresent should be "1f7e0f8378000008" == trimmmed(0x1f7e0f8378000008) ==
-  //     0b0001111101111110000011111000001101111000000000000000000000001000
+  // datapresent should be "1f7e000378000008" == trimmmed(0x1f7e000378000008) ==
+  //     0b0001111101111110000000000000001101111000000000000000000000001000
   // The set bits are:
   //  3 == NAME_FIRST
   //  4 == NAME_MIDDLE
   //  5 == NAME_LAST
   //  6 == NAME_MIDDLE_INITIAL
   //  7 == NAME_FULL
   //  9 == EMAIL_ADDRESS
   // 10 == PHONE_HOME_NUMBER,
   // 11 == PHONE_HOME_CITY_CODE,
   // 12 == PHONE_HOME_COUNTRY_CODE,
   // 13 == PHONE_HOME_CITY_AND_NUMBER,
   // 14 == PHONE_HOME_WHOLE_NUMBER,
-  // 20 == PHONE_FAX_NUMBER,
-  // 21 == PHONE_FAX_CITY_CODE,
-  // 22 == PHONE_FAX_COUNTRY_CODE,
-  // 23 == PHONE_FAX_CITY_AND_NUMBER,
-  // 24 == PHONE_FAX_WHOLE_NUMBER,
   // 30 == ADDRESS_HOME_LINE1
   // 31 == ADDRESS_HOME_LINE2
   // 33 == ADDRESS_HOME_CITY
   // 34 == ADDRESS_HOME_STATE
   // 35 == ADDRESS_HOME_ZIP
   // 36 == ADDRESS_HOME_COUNTRY
   // 60 == COMPANY_NAME
   available_field_types.clear();
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_MIDDLE);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(NAME_MIDDLE_INITIAL);
   available_field_types.insert(NAME_FULL);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(PHONE_HOME_NUMBER);
   available_field_types.insert(PHONE_HOME_CITY_CODE);
   available_field_types.insert(PHONE_HOME_COUNTRY_CODE);
   available_field_types.insert(PHONE_HOME_CITY_AND_NUMBER);
   available_field_types.insert(PHONE_HOME_WHOLE_NUMBER);
-  available_field_types.insert(PHONE_FAX_NUMBER);
-  available_field_types.insert(PHONE_FAX_CITY_CODE);
-  available_field_types.insert(PHONE_FAX_COUNTRY_CODE);
-  available_field_types.insert(PHONE_FAX_CITY_AND_NUMBER);
-  available_field_types.insert(PHONE_FAX_WHOLE_NUMBER);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_LINE2);
   available_field_types.insert(ADDRESS_HOME_CITY);
   available_field_types.insert(ADDRESS_HOME_STATE);
   available_field_types.insert(ADDRESS_HOME_ZIP);
   available_field_types.insert(ADDRESS_HOME_COUNTRY);
   available_field_types.insert(COMPANY_NAME);
 
   EXPECT_TRUE(form_structure.EncodeUploadRequest(available_field_types, false,
                                                  &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
             " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"1f7e0f8378000008\">"
+            " datapresent=\"1f7e000378000008\">"
             "<field signature=\"1089846351\" autofilltype=\"1\"/>"
             "<field signature=\"2404144663\" autofilltype=\"1\"/>"
             "<field signature=\"420638584\" autofilltype=\"1\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // All supported credit card types available.
   // datapresent should be "0000000000001fc0" == trimmmed(0x0000000000001fc0) ==
   //     0b0000000000000000000000000000000000000000000000000001111111000000
   // The set bits are:
@@ skipping 19 matching lines @@
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
             " formsignature=\"6402244543831589061\" autofillused=\"false\""
             " datapresent=\"0000000000001fc0\">"
             "<field signature=\"1089846351\" autofilltype=\"1\"/>"
             "<field signature=\"2404144663\" autofilltype=\"1\"/>"
             "<field signature=\"420638584\" autofilltype=\"1\"/>"
             "</autofillupload>",
             encoded_xml);
 
   // All supported types available.
-  // datapresent should be "1f7e0f8378001fc8" == trimmmed(0x1f7e0f8378001fc8) ==
-  //     0b0001111101111110000011111000001101111000000000000001111111001000
+  // datapresent should be "1f7e000378001fc8" == trimmmed(0x1f7e000378001fc8) ==
+  //     0b0001111101111110000000000000001101111000000000000001111111001000
   // The set bits are:
   //  3 == NAME_FIRST
   //  4 == NAME_MIDDLE
   //  5 == NAME_LAST
   //  6 == NAME_MIDDLE_INITIAL
   //  7 == NAME_FULL
   //  9 == EMAIL_ADDRESS
   // 10 == PHONE_HOME_NUMBER,
   // 11 == PHONE_HOME_CITY_CODE,
   // 12 == PHONE_HOME_COUNTRY_CODE,
   // 13 == PHONE_HOME_CITY_AND_NUMBER,
   // 14 == PHONE_HOME_WHOLE_NUMBER,
-  // 20 == PHONE_FAX_NUMBER,
-  // 21 == PHONE_FAX_CITY_CODE,
-  // 22 == PHONE_FAX_COUNTRY_CODE,
-  // 23 == PHONE_FAX_CITY_AND_NUMBER,
-  // 24 == PHONE_FAX_WHOLE_NUMBER,
   // 30 == ADDRESS_HOME_LINE1
   // 31 == ADDRESS_HOME_LINE2
   // 33 == ADDRESS_HOME_CITY
   // 34 == ADDRESS_HOME_STATE
   // 35 == ADDRESS_HOME_ZIP
   // 36 == ADDRESS_HOME_COUNTRY
   // 51 == CREDIT_CARD_NAME
   // 52 == CREDIT_CARD_NUMBER
   // 53 == CREDIT_CARD_EXP_MONTH
   // 54 == CREDIT_CARD_EXP_2_DIGIT_YEAR
   // 55 == CREDIT_CARD_EXP_4_DIGIT_YEAR
   // 56 == CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR
   // 57 == CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR
   // 60 == COMPANY_NAME
   available_field_types.clear();
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_MIDDLE);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(NAME_MIDDLE_INITIAL);
   available_field_types.insert(NAME_FULL);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(PHONE_HOME_NUMBER);
   available_field_types.insert(PHONE_HOME_CITY_CODE);
   available_field_types.insert(PHONE_HOME_COUNTRY_CODE);
   available_field_types.insert(PHONE_HOME_CITY_AND_NUMBER);
   available_field_types.insert(PHONE_HOME_WHOLE_NUMBER);
-  available_field_types.insert(PHONE_FAX_NUMBER);
-  available_field_types.insert(PHONE_FAX_CITY_CODE);
-  available_field_types.insert(PHONE_FAX_COUNTRY_CODE);
-  available_field_types.insert(PHONE_FAX_CITY_AND_NUMBER);
-  available_field_types.insert(PHONE_FAX_WHOLE_NUMBER);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_LINE2);
   available_field_types.insert(ADDRESS_HOME_CITY);
   available_field_types.insert(ADDRESS_HOME_STATE);
   available_field_types.insert(ADDRESS_HOME_ZIP);
   available_field_types.insert(ADDRESS_HOME_COUNTRY);
   available_field_types.insert(CREDIT_CARD_NAME);
   available_field_types.insert(CREDIT_CARD_NUMBER);
   available_field_types.insert(CREDIT_CARD_EXP_MONTH);
   available_field_types.insert(CREDIT_CARD_EXP_2_DIGIT_YEAR);
   available_field_types.insert(CREDIT_CARD_EXP_4_DIGIT_YEAR);
   available_field_types.insert(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR);
   available_field_types.insert(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR);
   available_field_types.insert(COMPANY_NAME);
 
   EXPECT_TRUE(form_structure.EncodeUploadRequest(available_field_types, false,
                                                  &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
             " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"1f7e0f8378001fc8\">"
+            " datapresent=\"1f7e000378001fc8\">"
             "<field signature=\"1089846351\" autofilltype=\"1\"/>"
             "<field signature=\"2404144663\" autofilltype=\"1\"/>"
             "<field signature=\"420638584\" autofilltype=\"1\"/>"
             "</autofillupload>",
             encoded_xml);
 }
 
 TEST(FormStructureTest, CheckMultipleTypes) {
   // Throughout this test, datapresent should be
   // 0x1440000360000008 ==
@@ skipping 157 matching lines @@
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&&email&first")),
       form_structure->FormSignature());
 
   form.name = ASCIIToUTF16("login_form");
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first")),
       form_structure->FormSignature());
 }