Propagate correct data to the Toolbar servers

chrome/browser/autofill/form_structure_unittest.cc

 // Copyright (c) 2010 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/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 1653 matching lines @@
                         ASCIIToUTF16("radio"),
                         0,
                         false));
   possible_field_types.push_back(FieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_LINE1);
   form_structure.reset(new FormStructure(form));
   std::string encoded_xml;
   ASSERT_EQ(form_structure->field_count(), possible_field_types.size());
   for (size_t i = 0; i < form_structure->field_count(); ++i)
     form_structure->set_possible_types(i, possible_field_types[i]);
-  EXPECT_TRUE(form_structure->EncodeUploadRequest(false, &encoded_xml));
+  EXPECT_TRUE(form_structure->EncodeUploadRequest(false, "", &encoded_xml));
   EXPECT_EQ(encoded_xml,
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillupload "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" formsignature=\""
       "8269229441054798720\" autofillused=\"false\" datapresent=\"\"><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="
       "\"263446779\" autofilltype=\"30\"/></autofillupload>");
-  EXPECT_TRUE(form_structure->EncodeUploadRequest(true, &encoded_xml));
+  EXPECT_TRUE(form_structure->EncodeUploadRequest(true, "af11", &encoded_xml));
   EXPECT_EQ(encoded_xml,
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillupload "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" formsignature=\""
-      "8269229441054798720\" autofillused=\"true\" datapresent=\"\"><field "
+      "8269229441054798720\" autofillused=\"true\" datapresent=\"af11\"><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="
       "\"263446779\" autofilltype=\"30\"/></autofillupload>");
   // Add 5 address fields - this should be still a valid form.
   for (size_t i = 0; i < 5; ++i) {
     form.fields.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
                                                  ASCIIToUTF16("address"),
                                                  string16(),
                                                  ASCIIToUTF16("text"),
                                                  0,
                                                  false));
     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->set_possible_types(i, possible_field_types[i]);
-  EXPECT_TRUE(form_structure->EncodeUploadRequest(false, &encoded_xml));
+  EXPECT_TRUE(form_structure->EncodeUploadRequest(false, "", &encoded_xml));
   EXPECT_EQ(encoded_xml,
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillupload "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" formsignature=\""
       "2027360543766157144\" autofillused=\"false\" datapresent=\"\"><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=\"263446779\" "
       "autofilltype=\"30\"/><field signature=\"509334676\" autofilltype="
@@ skipping 24 matching lines @@
     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->set_possible_types(i, possible_field_types[i]);
-  EXPECT_FALSE(form_structure->EncodeUploadRequest(false, &encoded_xml));
+  EXPECT_FALSE(form_structure->EncodeUploadRequest(false, "", &encoded_xml));
   EXPECT_EQ(encoded_xml, "");
 }
 
 }  // namespace