Replace xmllite with libxml in autofill

components/autofill/core/browser/form_structure_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/form_structure.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 1492 matching lines @@
   checkable_field.is_checkable = true;
   checkable_field.label = ASCIIToUTF16("Checkable1");
   checkable_field.name = ASCIIToUTF16("Checkable1");
   form.fields.push_back(checkable_field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
   const char kSignature1[] = "11337937696949187602";
-  const char kResponse1[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+  const char kResponse1[] =
+      "<?xml version=\"1.0\"?>\n"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"11337937696949187602\">"
       "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\""
       " label=\"Name on Card\"/><field signature=\"1917667676\""
       " name=\"billing_address\" type=\"text\" label=\"Address\"/>"
       "<field signature=\"2226358947\" name=\"card_number\" type=\"text\""
       " label=\"Card Number\"/><field signature=\"747221617\""
       " name=\"expiration_month\" type=\"text\" label=\"Expiration Date\"/>"
       "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\""
-      " label=\"Expiration Year\"/></form></autofillquery>";
+      " label=\"Expiration Year\"/></form></autofillquery>\n";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   EXPECT_EQ(kResponse1, encoded_xml);
 
   // Add the same form, only one will be encoded, so EncodeQueryRequest() should
   // return the same data.
   forms.push_back(new FormStructure(form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   EXPECT_EQ(kResponse1, encoded_xml);
   // Add 5 address fields - this should be still a valid form.
   for (size_t i = 0; i < 5; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     form.fields.push_back(field);
   }
 
   forms.push_back(new FormStructure(form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(2U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   const char kSignature2[] = "8308881815906226214";
   EXPECT_EQ(kSignature2, encoded_signatures[1]);
-  const char kResponse2[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-  "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
-  "<form signature=\"11337937696949187602\"><field signature=\"412125936\""
-  " name=\"name_on_card\" type=\"text\" label=\"Name on Card\"/>"
-  "<field signature=\"1917667676\" name=\"billing_address\" type=\"text\""
-  " label=\"Address\"/><field signature=\"2226358947\" name=\"card_number\""
-  " type=\"text\" label=\"Card Number\"/>"
-  "<field signature=\"747221617\" name=\"expiration_month\" type=\"text\""
-  " label=\"Expiration Date\"/>"
-  "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\""
-  " label=\"Expiration Year\"/></form>"
-  "<form signature=\"8308881815906226214\">"
-  "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\""
-  " label=\"Name on Card\"/><field signature=\"1917667676\""
-  " name=\"billing_address\" type=\"text\" label=\"Address\"/>"
-  "<field signature=\"2226358947\" name=\"card_number\" type=\"text\""
-  " label=\"Card Number\"/><field signature=\"747221617\""
-  " name=\"expiration_month\" type=\"text\" label=\"Expiration Date\"/>"
-  "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\""
-  " label=\"Expiration Year\"/><field signature=\"509334676\" name=\"address\""
-  " type=\"text\" label=\"Address\"/><field signature=\"509334676\""
-  " name=\"address\" type=\"text\" label=\"Address\"/>"
-  "<field signature=\"509334676\" name=\"address\" type=\"text\""
-  " label=\"Address\"/><field signature=\"509334676\" name=\"address\""
-  " type=\"text\" label=\"Address\"/><field signature=\"509334676\""
-  " name=\"address\" type=\"text\" label=\"Address\"/></form></autofillquery>";
+  const char kResponse2[] =
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
+      "<form signature=\"11337937696949187602\"><field signature=\"412125936\""
+      " name=\"name_on_card\" type=\"text\" label=\"Name on Card\"/>"
+      "<field signature=\"1917667676\" name=\"billing_address\" type=\"text\""
+      " label=\"Address\"/><field signature=\"2226358947\" name=\"card_number\""
+      " type=\"text\" label=\"Card Number\"/>"
+      "<field signature=\"747221617\" name=\"expiration_month\" type=\"text\""
+      " label=\"Expiration Date\"/>"
+      "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\""
+      " label=\"Expiration Year\"/></form>"
+      "<form signature=\"8308881815906226214\">"
+      "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\""
+      " label=\"Name on Card\"/><field signature=\"1917667676\""
+      " name=\"billing_address\" type=\"text\" label=\"Address\"/>"
+      "<field signature=\"2226358947\" name=\"card_number\" type=\"text\""
+      " label=\"Card Number\"/><field signature=\"747221617\""
+      " name=\"expiration_month\" type=\"text\" label=\"Expiration Date\"/>"
+      "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\""
+      " label=\"Expiration Year\"/><field signature=\"509334676\" "
+      "name=\"address\""
+      " type=\"text\" label=\"Address\"/><field signature=\"509334676\""
+      " name=\"address\" type=\"text\" label=\"Address\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\"/><field signature=\"509334676\" name=\"address\""
+      " type=\"text\" label=\"Address\"/><field signature=\"509334676\""
+      " name=\"address\" type=\"text\" "
+      "label=\"Address\"/></form></autofillquery>\n";
   EXPECT_EQ(kResponse2, encoded_xml);
 
   FormData malformed_form(form);
   // Add 50 address fields - the form is not valid anymore, but previous ones
   // are. The result should be the same as in previous test.
   for (size_t i = 0; i < 50; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     malformed_form.fields.push_back(field);
   }
 
   forms.push_back(new FormStructure(malformed_form));
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(2U, encoded_signatures.size());
   EXPECT_EQ(kSignature1, encoded_signatures[0]);
   EXPECT_EQ(kSignature2, encoded_signatures[1]);
   EXPECT_EQ(kResponse2, encoded_xml);
 
   // Check that we fail if there are only bad form(s).
   ScopedVector<FormStructure> bad_forms;
   bad_forms.push_back(new FormStructure(malformed_form));
   EXPECT_FALSE(FormStructure::EncodeQueryRequest(
       bad_forms.get(), &encoded_signatures, &encoded_xml));
-  EXPECT_EQ(0U, encoded_signatures.size());
-  EXPECT_EQ("", encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeUploadRequest) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
   FormFieldData field;
@@ skipping 54 matching lines @@
   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);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"8736493185895608956\" autofillused=\"false\""
-            " datapresent=\"144200030e\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"1029417091\" name=\"email\" type=\"email\""
-            " label=\"Email\" autofilltype=\"9\"/>"
-            "<field signature=\"466116101\" name=\"phone\" type=\"number\""
-            " label=\"Phone\" autofilltype=\"14\"/>"
-            "<field signature=\"2799270304\" name=\"country\""
-            " type=\"select-one\" label=\"Country\" autofilltype=\"36\"/>"
-            "</autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"8736493185895608956\" autofillused=\"false\""
+      " datapresent=\"144200030e\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"1029417091\" name=\"email\" type=\"email\""
+      " label=\"Email\" autofilltype=\"9\"/>"
+      "<field signature=\"466116101\" name=\"phone\" type=\"number\""
+      " label=\"Phone\" autofilltype=\"14\"/>"
+      "<field signature=\"2799270304\" name=\"country\""
+      " type=\"select-one\" label=\"Country\" autofilltype=\"36\"/>"
+      "</autofillupload>\n",
+      encoded_xml);
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"8736493185895608956\""
-            " autofillused=\"true\" datapresent=\"144200030e\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"1029417091\" name=\"email\" type=\"email\""
-            " label=\"Email\" autofilltype=\"9\"/>"
-            "<field signature=\"466116101\" name=\"phone\" type=\"number\""
-            " label=\"Phone\" autofilltype=\"14\"/>"
-            "<field signature=\"2799270304\" name=\"country\""
-            " type=\"select-one\" label=\"Country\" autofilltype=\"36\"/>"
-            "</autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"8736493185895608956\""
+      " autofillused=\"true\" datapresent=\"144200030e\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"1029417091\" name=\"email\" type=\"email\""
+      " label=\"Email\" autofilltype=\"9\"/>"
+      "<field signature=\"466116101\" name=\"phone\" type=\"number\""
+      " label=\"Phone\" autofilltype=\"14\"/>"
+      "<field signature=\"2799270304\" name=\"country\""
+      " type=\"select-one\" label=\"Country\" autofilltype=\"36\"/>"
+      "</autofillupload>\n",
+      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 = "text";
     form.fields.push_back(field);
     possible_field_types.push_back(ServerFieldTypeSet());
     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,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"7816485729218079147\" autofillused=\"false\""
-            " datapresent=\"144200030e\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"1029417091\" name=\"email\" type=\"email\""
-            " label=\"Email\" autofilltype=\"9\"/>"
-            "<field signature=\"466116101\" name=\"phone\" type=\"number\""
-            " label=\"Phone\" autofilltype=\"14\"/>"
-            "<field signature=\"2799270304\" name=\"country\""
-            " type=\"select-one\" label=\"Country\" autofilltype=\"36\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"30\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"31\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"37\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"38\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"30\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"31\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"37\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"38\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"7816485729218079147\" autofillused=\"false\""
+      " datapresent=\"144200030e\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"1029417091\" name=\"email\" type=\"email\""
+      " label=\"Email\" autofilltype=\"9\"/>"
+      "<field signature=\"466116101\" name=\"phone\" type=\"number\""
+      " label=\"Phone\" autofilltype=\"14\"/>"
+      "<field signature=\"2799270304\" name=\"country\""
+      " type=\"select-one\" label=\"Country\" autofilltype=\"36\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"30\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"31\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"37\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"38\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"30\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"31\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"37\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"38\"/></autofillupload>\n",
+      encoded_xml);
 
   // Add 50 address fields - now the form is invalid, as it has too many fields.
   for (size_t i = 0; i < 50; ++i) {
     field.label = ASCIIToUTF16("Address");
     field.name = ASCIIToUTF16("address");
     field.form_control_type = "text";
     form.fields.push_back(field);
     possible_field_types.push_back(ServerFieldTypeSet());
     possible_field_types.back().insert(ADDRESS_HOME_LINE1);
     possible_field_types.back().insert(ADDRESS_HOME_LINE2);
@@ skipping 63 matching lines @@
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(USERNAME);
   available_field_types.insert(ACCOUNT_CREATION_PASSWORD);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   "42", &encoded_xml));
   EXPECT_EQ(
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?><autofillupload "
+      "<?xml version=\"1.0\"?>\n<autofillupload "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" "
       "formsignature=\"5810032074788446513\" autofillused=\"true\" "
       "datapresent=\"1440000000000000000802\" "
       "actionsignature=\"15724779818122431245\" "
       "loginformsignature=\"42\"><field signature=\"4224610201\" "
       "name=\"firstname\" type=\"\" label=\"First Name\" "
       "autocomplete=\"given-name\" autofilltype=\"3\"/><field "
       "signature=\"2786066110\" name=\"lastname\" type=\"\" label=\"Last "
       "Name\" autocomplete=\"family-name\" autofilltype=\"5\"/><field "
       "signature=\"1029417091\" name=\"email\" type=\"email\" label=\"Email\" "
       "autocomplete=\"email\" autofilltype=\"9\"/><field "
       "signature=\"239111655\" name=\"username\" type=\"text\" "
       "label=\"username\" autocomplete=\"email\" autofilltype=\"86\"/><field "
       "signature=\"2051817934\" name=\"password\" type=\"password\" "
       "label=\"password\" autocomplete=\"email\" "
-      "autofilltype=\"76\"/></autofillupload>",
+      "autofilltype=\"76\"/></autofillupload>\n",
       encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeUploadRequest_WithAutocomplete) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
@@ skipping 29 matching lines @@
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
   ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"14746822798145140279\" autofillused=\"true\""
-            " datapresent=\"1440\" actionsignature=\"15724779818122431245\">"
-            "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
-            " label=\"First Name\" autocomplete=\"given-name\""
-            " autofilltype=\"3\"/>"
-            "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
-            " label=\"Last Name\" autocomplete=\"family-name\""
-            " autofilltype=\"5\"/><field signature=\"1029417091\""
-            " name=\"email\" type=\"email\" label=\"Email\""
-            " autocomplete=\"email\" autofilltype=\"9\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"14746822798145140279\" autofillused=\"true\""
+      " datapresent=\"1440\" actionsignature=\"15724779818122431245\">"
+      "<field signature=\"3763331450\" name=\"firstname\" type=\"text\""
+      " label=\"First Name\" autocomplete=\"given-name\""
+      " autofilltype=\"3\"/>"
+      "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
+      " label=\"Last Name\" autocomplete=\"family-name\""
+      " autofilltype=\"5\"/><field signature=\"1029417091\""
+      " name=\"email\" type=\"email\" label=\"Email\""
+      " autocomplete=\"email\" autofilltype=\"9\"/></autofillupload>\n",
+      encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeUploadRequest_WithLabels) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
   FormFieldData field;
@@ skipping 22 matching lines @@
 
   ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   std::string(), &encoded_xml));
   // Expected that the first field does not send the label but others do.
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"6949133589768631292\" autofillused=\"true\""
-            " datapresent=\"1440\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1318412689\" type=\"text\" autofilltype=\"3\"/>"
-            "<field signature=\"1318412689\" type=\"text\" label=\"Last Name\""
-            " autofilltype=\"5\"/><field signature=\"1318412689\" type=\"text\""
-            " label=\"Email\" autofilltype=\"9\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"6949133589768631292\" autofillused=\"true\""
+      " datapresent=\"1440\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1318412689\" type=\"text\" autofilltype=\"3\"/>"
+      "<field signature=\"1318412689\" type=\"text\" label=\"Last Name\""
+      " autofilltype=\"5\"/><field signature=\"1318412689\" type=\"text\""
+      " label=\"Email\" autofilltype=\"9\"/></autofillupload>\n",
+      encoded_xml);
 }
 
 // Test that the form name is sent in the upload request.
 TEST_F(FormStructureTest, EncodeUploadRequest_WithFormName) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   // Setting the form name which we expect to see in the upload.
   form.name = base::ASCIIToUTF16("myform");
   form_structure.reset(new FormStructure(form));
@@ skipping 21 matching lines @@
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
   ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?><autofillupload"
-            " clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"2345951786066580868\" autofillused=\"true\""
-            " datapresent=\"1440\" actionsignature=\"15724779818122431245\""
-            " formname=\"myform\"><field signature=\"1318412689\" type=\"text\""
-            " autofilltype=\"3\"/><field signature=\"1318412689\" type=\"text\""
-            " autofilltype=\"5\"/><field signature=\"1318412689\" type=\"text\""
-            " autofilltype=\"9\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n<autofillupload"
+      " clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"2345951786066580868\" autofillused=\"true\""
+      " datapresent=\"1440\" actionsignature=\"15724779818122431245\""
+      " formname=\"myform\"><field signature=\"1318412689\" type=\"text\""
+      " autofilltype=\"3\"/><field signature=\"1318412689\" type=\"text\""
+      " autofilltype=\"5\"/><field signature=\"1318412689\" type=\"text\""
+      " autofilltype=\"9\"/></autofillupload>\n",
+      encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeUploadRequestPartialMetadata) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
   FormFieldData field;
@@ skipping 27 matching lines @@
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
   ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"13043654279838250996\" autofillused=\"true\""
-            " datapresent=\"1440\" actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1318412689\" type=\"text\" autofilltype=\"3\"/>"
-            "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
-            " label=\"Last Name\" autocomplete=\"family-name\""
-            " autofilltype=\"5\"/>"
-            "<field signature=\"1545468175\" name=\"lastname\" type=\"email\""
-            " label=\"Email\" autocomplete=\"email\" autofilltype=\"9\"/>"
-            "</autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"13043654279838250996\" autofillused=\"true\""
+      " datapresent=\"1440\" actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1318412689\" type=\"text\" autofilltype=\"3\"/>"
+      "<field signature=\"3494530716\" name=\"lastname\" type=\"text\""
+      " label=\"Last Name\" autocomplete=\"family-name\""
+      " autofilltype=\"5\"/>"
+      "<field signature=\"1545468175\" name=\"lastname\" type=\"email\""
+      " label=\"Email\" autocomplete=\"email\" autofilltype=\"9\"/>"
+      "</autofillupload>\n",
+      encoded_xml);
 }
 
 // Sending field metadata to the server is disabled.
 TEST_F(FormStructureTest, EncodeUploadRequest_DisabledMetadataTrial) {
   DisableAutofillMetadataFieldTrial();
 
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
@@ skipping 31 matching lines @@
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
 
   ServerFieldTypeSet available_field_types;
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(EMAIL_ADDRESS);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, true,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"14746822798145140279\" autofillused=\"true\""
-            " datapresent=\"1440\"><field signature=\"3763331450\""
-            " autofilltype=\"3\"/><field signature=\"3494530716\""
-            " autofilltype=\"5\"/><field signature=\"1029417091\""
-            " autofilltype=\"9\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"14746822798145140279\" autofillused=\"true\""
+      " datapresent=\"1440\"><field signature=\"3763331450\""
+      " autofilltype=\"3\"/><field signature=\"3494530716\""
+      " autofilltype=\"5\"/><field signature=\"1029417091\""
+      " autofilltype=\"9\"/></autofillupload>\n",
+      encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeFieldAssignments) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
 
   FormFieldData field;
@@ skipping 55 matching lines @@
   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);
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure->EncodeFieldAssignments(
       available_field_types, &encoded_xml));
   EXPECT_EQ(
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+      "<?xml version=\"1.0\"?>\n"
       "<fieldassignments formsignature=\"8736493185895608956\">"
       "<fields fieldid=\"3763331450\" fieldtype=\"3\" name=\"firstname\"/>"
       "<fields fieldid=\"3494530716\" fieldtype=\"5\" name=\"lastname\"/>"
       "<fields fieldid=\"1029417091\" fieldtype=\"9\" name=\"email\"/>"
       "<fields fieldid=\"466116101\" fieldtype=\"14\" name=\"phone\"/>"
       "<fields fieldid=\"2799270304\" fieldtype=\"36\" name=\"country\"/>"
       "<fields fieldid=\"3410250678\" fieldtype=\"36\" name=\"Checkable1\"/>"
-      "</fieldassignments>",
+      "</fieldassignments>\n",
       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 = "text";
     form.fields.push_back(field);
     possible_field_types.push_back(ServerFieldTypeSet());
     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->EncodeFieldAssignments(
       available_field_types, &encoded_xml));
   EXPECT_EQ(
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+      "<?xml version=\"1.0\"?>\n"
       "<fieldassignments formsignature=\"7816485729218079147\">"
       "<fields fieldid=\"3763331450\" fieldtype=\"3\" name=\"firstname\"/>"
       "<fields fieldid=\"3494530716\" fieldtype=\"5\" name=\"lastname\"/>"
       "<fields fieldid=\"1029417091\" fieldtype=\"9\" name=\"email\"/>"
       "<fields fieldid=\"466116101\" fieldtype=\"14\" name=\"phone\"/>"
       "<fields fieldid=\"2799270304\" fieldtype=\"36\" name=\"country\"/>"
       "<fields fieldid=\"3410250678\" fieldtype=\"36\" name=\"Checkable1\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"30\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"31\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"37\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"38\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"30\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"31\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"37\" name=\"address\"/>"
       "<fields fieldid=\"509334676\" fieldtype=\"38\" name=\"address\"/>"
-      "</fieldassignments>",
+      "</fieldassignments>\n",
       encoded_xml);
 }
 
 // Check that we compute the "datapresent" string correctly for the given
 // |available_types|.
 TEST_F(FormStructureTest, CheckDataPresence) {
   FormData form;
 
   FormFieldData field;
   field.form_control_type = "text";
@@ skipping 18 matching lines @@
     form_structure.field(i)->set_possible_types(unknown_type);
 
   // No available types.
   // datapresent should be "" == trimmmed(0x0000000000000000) ==
   //     0b0000000000000000000000000000000000000000000000000000000000000000
   ServerFieldTypeSet available_field_types;
 
   std::string encoded_xml;
   EXPECT_TRUE(form_structure.EncodeUploadRequest(available_field_types, false,
                                                  std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"\" actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"1\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"1\"/>"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"Email\" autofilltype=\"1\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"6402244543831589061\" autofillused=\"false\""
+      " datapresent=\"\" actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"1\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"1\"/>"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"Email\" autofilltype=\"1\"/></autofillupload>\n",
+      encoded_xml);
 
   // Only a few types available.
   // datapresent should be "1540000240" == trimmmed(0x1540000240000000) ==
   //     0b0001010101000000000000000000001001000000000000000000000000000000
   // The set bits are:
   //  3 == NAME_FIRST
   //  5 == NAME_LAST
   //  7 == NAME_FULL
   //  9 == EMAIL_ADDRESS
   // 30 == ADDRESS_HOME_LINE1
   // 33 == ADDRESS_HOME_CITY
   available_field_types.clear();
   available_field_types.insert(NAME_FIRST);
   available_field_types.insert(NAME_LAST);
   available_field_types.insert(NAME_FULL);
   available_field_types.insert(EMAIL_ADDRESS);
   available_field_types.insert(ADDRESS_HOME_LINE1);
   available_field_types.insert(ADDRESS_HOME_CITY);
 
   EXPECT_TRUE(form_structure.EncodeUploadRequest(available_field_types, false,
                                                  std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"1540000240\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"1\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"1\"/>"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"Email\" autofilltype=\"1\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"6402244543831589061\" autofillused=\"false\""
+      " datapresent=\"1540000240\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"1\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"1\"/>"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"Email\" autofilltype=\"1\"/></autofillupload>\n",
+      encoded_xml);
 
   // All supported non-credit card types available.
   // 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
@@ skipping 25 matching lines @@
   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,
                                                  std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"1f7e000378000008\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"1\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"1\"/>"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"Email\" autofilltype=\"1\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"6402244543831589061\" autofillused=\"false\""
+      " datapresent=\"1f7e000378000008\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"1\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"1\"/>"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"Email\" autofilltype=\"1\"/></autofillupload>\n",
+      encoded_xml);
 
   // All supported credit card types available.
   // datapresent should be "0000000000001fc0" == trimmmed(0x0000000000001fc0) ==
   //     0b0000000000000000000000000000000000000000000000000001111111000000
   // The set bits are:
   // 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
   available_field_types.clear();
   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);
 
   EXPECT_TRUE(form_structure.EncodeUploadRequest(available_field_types, false,
                                                  std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"0000000000001fc0\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"1\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"1\"/>"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"Email\" autofilltype=\"1\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"6402244543831589061\" autofillused=\"false\""
+      " datapresent=\"0000000000001fc0\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"1\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"1\"/>"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"Email\" autofilltype=\"1\"/></autofillupload>\n",
+      encoded_xml);
 
   // All supported types available.
   // 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
@@ skipping 39 matching lines @@
   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,
                                                  std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"6402244543831589061\" autofillused=\"false\""
-            " datapresent=\"1f7e000378001fc8\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"1\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"1\"/>"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"Email\" autofilltype=\"1\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"6402244543831589061\" autofillused=\"false\""
+      " datapresent=\"1f7e000378001fc8\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"1\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"1\"/>"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"Email\" autofilltype=\"1\"/></autofillupload>\n",
+      encoded_xml);
 }
 
 TEST_F(FormStructureTest, CheckMultipleTypes) {
   // Throughout this test, datapresent should be
   // 0x1440000360000008 ==
   //     0b0001010001000000000000000000001101100000000000000000000000001000
   // The set bits are:
   //  3 == NAME_FIRST
   //  5 == NAME_LAST
   //  9 == EMAIL_ADDRESS
@@ skipping 46 matching lines @@
 
   form_structure.reset(new FormStructure(form));
 
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->field(i)->set_possible_types(possible_field_types[i]);
   std::string encoded_xml;
 
   // Now we matched both fields singularly.
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"18062476096658145866\" autofillused=\"false\""
-            " datapresent=\"1440000360000008\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"email\" autofilltype=\"9\"/>"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"30\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"18062476096658145866\" autofillused=\"false\""
+      " datapresent=\"1440000360000008\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"email\" autofilltype=\"9\"/>"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"30\"/></autofillupload>\n",
+      encoded_xml);
   // Match third field as both first and last.
   possible_field_types[2].insert(NAME_FIRST);
   form_structure->field(2)->set_possible_types(possible_field_types[2]);
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"18062476096658145866\" autofillused=\"false\""
-            " datapresent=\"1440000360000008\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"email\" autofilltype=\"9\"/>"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"30\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"18062476096658145866\" autofillused=\"false\""
+      " datapresent=\"1440000360000008\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"email\" autofilltype=\"9\"/>"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"30\"/></autofillupload>\n",
+      encoded_xml);
   possible_field_types[3].insert(ADDRESS_HOME_LINE2);
   form_structure->field(form_structure->field_count() - 1)->set_possible_types(
       possible_field_types[form_structure->field_count() - 1]);
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"18062476096658145866\" autofillused=\"false\""
-            " datapresent=\"1440000360000008\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"email\" autofilltype=\"9\"/>"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"30\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"31\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"18062476096658145866\" autofillused=\"false\""
+      " datapresent=\"1440000360000008\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"email\" autofilltype=\"9\"/>"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"30\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"31\"/></autofillupload>\n",
+      encoded_xml);
   possible_field_types[3].clear();
   possible_field_types[3].insert(ADDRESS_HOME_LINE1);
   possible_field_types[3].insert(COMPANY_NAME);
   form_structure->field(form_structure->field_count() - 1)->set_possible_types(
       possible_field_types[form_structure->field_count() - 1]);
   EXPECT_TRUE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                   std::string(), &encoded_xml));
-  EXPECT_EQ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-            "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
-            " formsignature=\"18062476096658145866\" autofillused=\"false\""
-            " datapresent=\"1440000360000008\""
-            " actionsignature=\"15724779818122431245\">"
-            "<field signature=\"420638584\" name=\"email\" type=\"text\""
-            " label=\"email\" autofilltype=\"9\"/>"
-            "<field signature=\"1089846351\" name=\"first\" type=\"text\""
-            " label=\"First Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"3\"/>"
-            "<field signature=\"2404144663\" name=\"last\" type=\"text\""
-            " label=\"Last Name\" autofilltype=\"5\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"30\"/>"
-            "<field signature=\"509334676\" name=\"address\" type=\"text\""
-            " label=\"Address\" autofilltype=\"60\"/></autofillupload>",
-            encoded_xml);
+  EXPECT_EQ(
+      "<?xml version=\"1.0\"?>\n"
+      "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
+      " formsignature=\"18062476096658145866\" autofillused=\"false\""
+      " datapresent=\"1440000360000008\""
+      " actionsignature=\"15724779818122431245\">"
+      "<field signature=\"420638584\" name=\"email\" type=\"text\""
+      " label=\"email\" autofilltype=\"9\"/>"
+      "<field signature=\"1089846351\" name=\"first\" type=\"text\""
+      " label=\"First Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"3\"/>"
+      "<field signature=\"2404144663\" name=\"last\" type=\"text\""
+      " label=\"Last Name\" autofilltype=\"5\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"30\"/>"
+      "<field signature=\"509334676\" name=\"address\" type=\"text\""
+      " label=\"Address\" autofilltype=\"60\"/></autofillupload>\n",
+      encoded_xml);
 }
 
 TEST_F(FormStructureTest, CheckFormSignature) {
   // Check that form signature is created correctly.
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   FormFieldData field;
   field.form_control_type = "text";
 
@@ skipping 105 matching lines @@
   field.form_control_type = "text";
   field.is_checkable = false;
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
 
   const char kSignature[] = "18006745212084723782";
-  const char kResponse[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+  const char kResponse[] =
+      "<?xml version=\"1.0\"?>\n"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"18006745212084723782\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\""
       " label=\"username\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\"/>"
-      "</form></autofillquery>";
+      "</form></autofillquery>\n";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature, encoded_signatures[0]);
   EXPECT_EQ(kResponse, encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeQueryRequest_WithLabels) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
@@ skipping 14 matching lines @@
   field.label = ASCIIToUTF16("Enter your Password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
 
-  const char kRequest[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+  const char kRequest[] =
+      "<?xml version=\"1.0\"?>\n"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"13906559713264665730\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\""
       " label=\"Enter your Email address\"/>"
       "<field signature=\"2051817934\" name=\"password\" type=\"password\""
-      " label=\"Enter your Password\"/></form></autofillquery>";
+      " label=\"Enter your Password\"/></form></autofillquery>\n";
   EXPECT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   EXPECT_EQ(kRequest, encoded_xml);
 }
 
 TEST_F(FormStructureTest, EncodeQueryRequest_WithLongLabels) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
@@ skipping 18 matching lines @@
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
 
   const char kRequest[] =
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+      "<?xml version=\"1.0\"?>\n"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"13906559713264665730\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\""
       " label=\"Enter Your Really Really Really (Really!) Long Email Address"
       " Which We Hope To Get In Order To Send You Unwanted Publicity Because"
       " That's What Marketers Do! We Know That Your Email Address Has The"
       " Poss\"/>"
       "<field signature=\"2051817934\" name=\"password\" type=\"password\""
-      " label=\"Enter your Password\"/></form></autofillquery>";
+      " label=\"Enter your Password\"/></form></autofillquery>\n";
   EXPECT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   EXPECT_EQ(kRequest, encoded_xml);
 }
 
 // One name is missing from one field.
 TEST_F(FormStructureTest, EncodeQueryRequest_MissingNames) {
   FormData form;
   // No name set for the form.
   form.origin = GURL("http://cool.com");
@@ skipping 11 matching lines @@
   field.form_control_type = "text";
   field.is_checkable = false;
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
 
   const char kSignature[] = "16416961345885087496";
-  const char kResponse[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+  const char kResponse[] =
+      "<?xml version=\"1.0\"?>\n"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"16416961345885087496\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\""
       " label=\"username\"/><field signature=\"1318412689\" type=\"text\"/>"
-      "</form></autofillquery>";
+      "</form></autofillquery>\n";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature, encoded_signatures[0]);
   EXPECT_EQ(kResponse, encoded_xml);
 }
 
 // Sending field metadata to the server is disabled.
 TEST_F(FormStructureTest, EncodeQueryRequest_DisabledMetadataTrial) {
   DisableAutofillMetadataFieldTrial();
@@ skipping 14 matching lines @@
   field.form_control_type = "text";
   field.is_checkable = false;
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
   forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
 
   const char kSignature[] = "7635954436925888745";
-  const char kResponse[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+  const char kResponse[] =
+      "<?xml version=\"1.0\"?>\n"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
       "<form signature=\"7635954436925888745\">"
       "<field signature=\"239111655\"/>"
       "<field signature=\"3654076265\"/>"
-      "</form></autofillquery>";
+      "</form></autofillquery>\n";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(
       forms.get(), &encoded_signatures, &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
   EXPECT_EQ(kSignature, encoded_signatures[0]);
   EXPECT_EQ(kResponse, encoded_xml);
 }
 
 TEST_F(FormStructureTest, PossibleValues) {
   FormData form_data;
   FormFieldData field;
@@ skipping 115 matching lines @@
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get(), nullptr);
 
   ASSERT_GE(forms[0]->field_count(), 2U);
   EXPECT_EQ(NO_SERVER_DATA, forms[0]->field(0)->server_type());
   EXPECT_EQ(76, forms[0]->field(1)->server_type());
 }
 
 }  // namespace autofill