[Autofill] No longer send form name at query time.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 1407 matching lines @@
   // Expiration Year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             form_structure->field(4)->heuristic_type());
   // CVC code.
   EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
             form_structure->field(5)->heuristic_type());
 }
 
 TEST(FormStructureTest, EncodeQueryRequest) {
   FormData form;
-  form.name = ASCIIToUTF16("shipping-form");
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("billing_address");
@@ skipping 15 matching lines @@
   FormFieldData checkable_field;
   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[] = "18299433261292307089";
+  const char kSignature1[] = "11337937696949187602";
   const char kResponse1[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
-      "<form signature=\"18299433261292307089\" name=\"shipping-form\">"
+      "<form signature=\"11337937696949187602\">"
       "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\"/>"
       "<field signature=\"1917667676\" name=\"billing_address\" type=\"text\"/>"
       "<field signature=\"2226358947\" name=\"card_number\" type=\"text\"/>"
       "<field signature=\"747221617\" name=\"expiration_month\" type=\"text\"/>"
       "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\"/>"
       "</form></autofillquery>";
   ASSERT_TRUE(FormStructure::EncodeQueryRequest(forms.get(),
                                                 &encoded_signatures,
                                                 &encoded_xml));
   ASSERT_EQ(1U, encoded_signatures.size());
@@ skipping 15 matching lines @@
     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[] = "12765336621163642783";
+  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=\"18299433261292307089\" name=\"shipping-form\">"
+      "<form signature=\"11337937696949187602\">"
       "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\"/>"
       "<field signature=\"1917667676\" name=\"billing_address\" type=\"text\"/>"
       "<field signature=\"2226358947\" name=\"card_number\" type=\"text\"/>"
       "<field signature=\"747221617\" name=\"expiration_month\" type=\"text\"/>"
       "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\"/>"
-      "</form><form signature=\"12765336621163642783\" name=\"shipping-form\">"
+      "</form><form signature=\"8308881815906226214\">"
       "<field signature=\"412125936\" name=\"name_on_card\" type=\"text\"/>"
       "<field signature=\"1917667676\" name=\"billing_address\" type=\"text\"/>"
       "<field signature=\"2226358947\" name=\"card_number\" type=\"text\"/>"
       "<field signature=\"747221617\" name=\"expiration_month\" type=\"text\"/>"
       "<field signature=\"4108155786\" name=\"expiration_year\" type=\"text\"/>"
       "<field signature=\"509334676\" name=\"address\" type=\"text\"/>"
       "<field signature=\"509334676\" name=\"address\" type=\"text\"/>"
       "<field signature=\"509334676\" name=\"address\" type=\"text\"/>"
       "<field signature=\"509334676\" name=\"address\" type=\"text\"/>"
-      "<field signature=\"509334676\" name=\"address\" type=\"text\"/></form>"
-      "</autofillquery>";
+      "<field signature=\"509334676\" name=\"address\" type=\"text\"/>"
+      "</form></autofillquery>";
   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);
   }
@@ skipping 941 matching lines @@
   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\"?>"
       "<autofillquery clientversion=\"6.1.1715.1442/en (GGLL)\">"
-      "<form signature=\"18006745212084723782\" name=\"the-name\">"
+      "<form signature=\"18006745212084723782\">"
       "<field signature=\"239111655\" name=\"username\" type=\"text\"/>"
       "<field signature=\"420638584\" name=\"email\" type=\"text\"/></form>"
       "</autofillquery>";
   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);
 }
 
-// Some of the names are missing from the form and one field.
+// One name is missing from one field.
 TEST(FormStructureTest, EncodeQueryRequest_MissingNames) {
   FormData form;
   // No name set for the form.
   form.origin = GURL("http://cool.com");
   form.action = form.origin.Resolve("/login");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
@@ skipping 301 matching lines @@
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get(), &rappor_service);
 
   // No RAPPOR metrics are logged in the case there is at least some server data
   // available for all forms.
   EXPECT_EQ(0, rappor_service.GetReportsCount());
 }
 
 }  // namespace autofill