Remove autocheckout code.

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/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "url/gurl.h"
 
 using WebKit::WebInputElement;
 
 namespace autofill {
@@ skipping 64 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("address1");
   field.name = ASCIIToUTF16("address1");
   field.form_control_type = "text";
   field.should_autocomplete = false;
   form.fields.push_back(field);
 
   // The render process sends all fields to browser including fields with
   // autocomplete=off
-  form_structure.reset(new FormStructure(form, std::string()));
-  EXPECT_EQ(4U, form_structure->field_count());
-
-  // We expect the same count when autocheckout is enabled.
-  form_structure.reset(new FormStructure(form, "http://fake_url"));
+  form_structure.reset(new FormStructure(form));
   EXPECT_EQ(4U, form_structure->field_count());
 }
 
 TEST(FormStructureTest, AutofillCount) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
@@ skipping 10 matching lines @@
   field.name = ASCIIToUTF16("state");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
   // Only text and select fields that are heuristically matched are counted.
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_EQ(1U, form_structure->autofill_count());
 
   // Add a field with should_autocomplete=false.
   field.label = ASCIIToUTF16("address1");
   field.name = ASCIIToUTF16("address1");
   field.form_control_type = "text";
   field.should_autocomplete = false;
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   // DetermineHeuristicTypes also assign field type for fields with
   // autocomplete=off thus autofill_count includes them. This is a bug,
   // and they should not be counted. See http://crbug.com/176432 for details.
   // TODO(benquan): change it to EXPECT_EQ(1U, ... when the bug is fixed.
   EXPECT_EQ(2U, form_structure->autofill_count());
-
-  // All fields should be counted when Autocheckout is enabled.
-  form_structure.reset(new FormStructure(form, "http://fake_url"));
-  form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
-  EXPECT_EQ(2U, form_structure->autofill_count());
 }
 
 TEST(FormStructureTest, SourceURL) {
   FormData form;
   form.origin = GURL("http://www.foo.com/");
   form.method = ASCIIToUTF16("post");
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
 
   EXPECT_EQ(form.origin, form_structure.source_url());
 }
 
 TEST(FormStructureTest, IsAutofillable) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   // We need at least three text fields to be auto-fillable.
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
-  // When autocheckout is enabled, we enable autofill even the form has
-  // no fields
-  form_structure.reset(new FormStructure(form, "http://fake_url"));
-  form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
-  EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(form_structure->IsAutofillable(true));
 
-  // We do not limit to three text fields when autocheckout is enabled.
-  form_structure.reset(new FormStructure(form, "http://fake_url"));
-  form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
-  EXPECT_TRUE(form_structure->IsAutofillable(true));
-
   // We now have three text fields, but only two auto-fillable fields.
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // We now have three auto-fillable fields.
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "email";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // The method must be 'post', though we can intentionally ignore this
   // criterion for the sake of providing a helpful warning message to the user.
   form.method = ASCIIToUTF16("get");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(form_structure->IsAutofillable(true));
   EXPECT_TRUE(form_structure->IsAutofillable(false));
 
   // The target cannot include http(s)://*/search...
   form.method = ASCIIToUTF16("post");
   form.action = GURL("http://google.com/search?q=hello");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(form_structure->IsAutofillable(true));
 
   // But search can be in the URL.
   form.action = GURL("http://search.com/?q=hello");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 }
 
 TEST(FormStructureTest, ShouldBeParsed) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   // We need at least three text fields to be parseable.
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.label = ASCIIToUTF16("username");
   field.name = ASCIIToUTF16("username");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   FormFieldData checkable_field;
   checkable_field.is_checkable = true;
   checkable_field.name = ASCIIToUTF16("radiobtn");
   checkable_field.form_control_type = "radio";
   form.fields.push_back(checkable_field);
 
   checkable_field.name = ASCIIToUTF16("checkbox");
   checkable_field.form_control_type = "checkbox";
   form.fields.push_back(checkable_field);
 
   // We have only one text field, should not be parsed.
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed(true));
 
-  // The form should be parsed for autocheckout even it has less than three
-  // text fields.
-  form_structure.reset(new FormStructure(form, "http://fake_url"));
-  EXPECT_TRUE(form_structure->ShouldBeParsed(true));
-
   // We now have three text fields, though only two are auto-fillable.
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 
   // The method must be 'post', though we can intentionally ignore this
   // criterion for the sake of providing a helpful warning message to the user.
   form.method = ASCIIToUTF16("get");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->IsAutofillable(true));
   EXPECT_TRUE(form_structure->ShouldBeParsed(false));
 
   // The target cannot include http(s)://*/search...
   form.method = ASCIIToUTF16("post");
   form.action = GURL("http://google.com/search?q=hello");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed(true));
 
   // But search can be in the URL.
   form.action = GURL("http://search.com/?q=hello");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 
   // The form need only have three fields, but at least one must be a text
   // field.
   form.fields.clear();
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "email";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("State");
   field.name = ASCIIToUTF16("state");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Country");
   field.name = ASCIIToUTF16("country");
   field.form_control_type = "select-one";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 
   form.fields[0].form_control_type = "select-one";
   // Now, no text fields.
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_FALSE(form_structure->ShouldBeParsed(true));
-
-  // It should be parsed when autocheckout is enabled.
-  form_structure.reset(new FormStructure(form, "http://fake_url"));
-  EXPECT_TRUE(form_structure->ShouldBeParsed(true));
 }
 
 TEST(FormStructureTest, HeuristicsContactInfo) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.form_control_type = "text";
 
@@ skipping 23 matching lines @@
 
   field.label = ASCIIToUTF16("Zip code");
   field.name = ASCIIToUTF16("zipcode");
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   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.
@@ skipping 30 matching lines @@
   field.label = base::string16();
   field.name = ASCIIToUTF16("field2");
   field.autocomplete_attribute = "family-name";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("field3");
   field.autocomplete_attribute = "email";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(HTML_TYPE_GIVEN_NAME, form_structure->field(0)->html_type());
   EXPECT_EQ(HTML_TYPE_FAMILY_NAME, form_structure->field(1)->html_type());
   EXPECT_EQ(HTML_TYPE_EMAIL, form_structure->field(2)->html_type());
@@ skipping 20 matching lines @@
   field.label = base::string16();
   field.name = ASCIIToUTF16("field2");
   field.autocomplete_attribute = "tel-local-prefix";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("field3");
   field.autocomplete_attribute = "tel-local-suffix";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   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(HTML_TYPE_TEL_LOCAL, form_structure->field(0)->html_type());
   EXPECT_EQ(AutofillField::IGNORED, form_structure->field(0)->phone_part());
   EXPECT_EQ(HTML_TYPE_TEL_LOCAL_PREFIX, form_structure->field(1)->html_type());
@@ skipping 20 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("lastname");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   EXPECT_TRUE(form_structure->ShouldBeCrowdsourced());
 
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
 
   // Now update the first form field to include an 'autocomplete' attribute.
   form.fields.front().autocomplete_attribute = "x-other";
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(form_structure->IsAutofillable(true));
   EXPECT_FALSE(form_structure->ShouldBeCrowdsourced());
 
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(0U, form_structure->autofill_count());
 
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
-
-  // When Autocheckout is enabled, we should ignore 'autocomplete' attribute
-  // when deciding to crowdsource.
-  form_structure.reset(new FormStructure(form, "http://fake.url"));
-  form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
-  EXPECT_TRUE(form_structure->IsAutofillable(true));
-  EXPECT_TRUE(form_structure->ShouldBeCrowdsourced());
-
-  ASSERT_EQ(3U, form_structure->field_count());
-  ASSERT_EQ(0U, form_structure->autofill_count());
-
-  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(0)->heuristic_type());
-  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
-  EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
 }
 
 // Verify that we can correctly process sections listed in the |autocomplete|
 // attribute.
 TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSections) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.form_control_type = "text";
@@ skipping 29 matching lines @@
   // different sections.  This is only an interesting test due to how we
   // implement implicit section names from attributes like "shipping email"; see
   // the implementation for more details.
   field.autocomplete_attribute = "section--shipping email";
   form.fields.push_back(field);
 
   // Credit card fields are implicitly in a separate section from other fields.
   field.autocomplete_attribute = "section-foo cc-number";
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure.IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(9U, form_structure.field_count());
   EXPECT_EQ(9U, form_structure.autofill_count());
 
   // All of the fields in this form should be parsed as belonging to different
   // sections.
   std::set<std::string> section_names;
@@ skipping 24 matching lines @@
   // Invalid tokens should prevent us from setting a section name.
   field.autocomplete_attribute = "garbage section-foo email";
   form.fields.push_back(field);
   field.autocomplete_attribute = "garbage section-bar email";
   form.fields.push_back(field);
   field.autocomplete_attribute = "garbage shipping email";
   form.fields.push_back(field);
   field.autocomplete_attribute = "garbage billing email";
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
 
   // Expect the correct number of fields.
   ASSERT_EQ(6U, form_structure.field_count());
   EXPECT_EQ(2U, form_structure.autofill_count());
 
   // All of the fields in this form should be parsed as belonging to the same
   // section.
   std::set<std::string> section_names;
   for (size_t i = 0; i < 6; ++i) {
     section_names.insert(form_structure.field(i)->section());
   }
   EXPECT_EQ(1U, section_names.size());
 }
 
 // Verify that we can correctly process repeated sections listed in the
 // |autocomplete| attribute.
 TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSectionsRepeated) {
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.autocomplete_attribute = "section-foo email";
   form.fields.push_back(field);
   field.autocomplete_attribute = "section-foo address-line1";
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
 
   // Expect the correct number of fields.
   ASSERT_EQ(2U, form_structure.field_count());
   EXPECT_EQ(2U, form_structure.autofill_count());
 
   // All of the fields in this form should be parsed as belonging to the same
   // section.
   std::set<std::string> section_names;
   for (size_t i = 0; i < 2; ++i) {
@@ skipping 17 matching lines @@
   field.name = base::string16();
   field.autocomplete_attribute = "section-foo email";
   form.fields.push_back(field);
   field.name = base::string16();
   field.autocomplete_attribute = "name";
   form.fields.push_back(field);
   field.name = ASCIIToUTF16("two");
   field.autocomplete_attribute = "address-line1";
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
 
   // Expect the correct number of fields.
   ASSERT_EQ(4U, form_structure.field_count());
   EXPECT_EQ(4U, form_structure.autofill_count());
 
   // Normally, the two separate address fields would cause us to detect two
   // separate sections; but because there is an author-specified section in this
   // form, we do not apply these usual heuristics.
   EXPECT_EQ(ASCIIToUTF16("one"), form_structure.field(0)->name);
@@ skipping 44 matching lines @@
 
   field.label = ASCIIToUTF16("Phone Number:");
   field.name = ASCIIToUTF16("BillTo.Phone");
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(10U, form_structure->field_count());
   ASSERT_EQ(9U, 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());
   // Address.
@@ skipping 47 matching lines @@
   field.label = ASCIIToUTF16("Zip Code");
   field.name = ASCIIToUTF16("Home.PostalCode");
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.value = ASCIIToUTF16("continue");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(6U, form_structure->autofill_count());
 
   // Email.
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(0)->heuristic_type());
   // Full name.
   EXPECT_EQ(NAME_FULL, form_structure->field(1)->heuristic_type());
   // Company
@@ skipping 45 matching lines @@
 
   field.label = ASCIIToUTF16("Zip code");
   field.name = base::string16();
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   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.
@@ skipping 37 matching lines @@
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(6U, form_structure->field_count());
   ASSERT_EQ(5U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Credit card number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(1)->heuristic_type());
   // Credit card expiration month.
@@ skipping 40 matching lines @@
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(7U, form_structure->field_count());
   ASSERT_EQ(5U, form_structure->autofill_count());
 
   // Credit card name.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Credit card type.  This is an unknown type but related to the credit card.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
   // Credit card number.
@@ skipping 27 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line3");
   field.name = ASCIIToUTF16("Address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("City");
   field.name = ASCIIToUTF16("city");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
@@ skipping 21 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line1");
   field.name = ASCIIToUTF16("billing.address.addressLine1");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line2");
   field.name = ASCIIToUTF16("billing.address.addressLine2");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(4U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 1.
@@ skipping 20 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line3");
   field.name = ASCIIToUTF16("billing.address.addressLine3");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line4");
   field.name = ASCIIToUTF16("billing.address.addressLine4");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(2U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3 (ignored).
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
@@ skipping 23 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Street address second line");
   field.name = ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_ads2");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("City:");
   field.name = ASCIIToUTF16("FOPIH_RgWebCC_0_IHAddress_adct");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   EXPECT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Suite / Apt.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
@@ skipping 18 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Floor number, suite number, etc");
   field.name = ASCIIToUTF16("address2");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("City:");
   field.name = ASCIIToUTF16("city");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // City.
@@ skipping 13 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line2");
   field.name = ASCIIToUTF16("Address");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("State/Province/Region");
   field.name = ASCIIToUTF16("State");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // State.
@@ skipping 46 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Phone*:");
   field.name = ASCIIToUTF16("editBillingAddress$phoneBox");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email Address*:");
   field.name = ASCIIToUTF16("email$emailBox");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(11U, form_structure->field_count());
   ASSERT_EQ(11U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(COMPANY_NAME, form_structure->field(2)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_LINE1, form_structure->field(3)->heuristic_type());
   EXPECT_EQ(ADDRESS_BILLING_LINE2, form_structure->field(4)->heuristic_type());
@@ skipping 30 matching lines @@
   field.max_length = 4;  // Size of suffix is 4.  If unlimited size is
                          // passed, phone will be parsed as
                          // <country code> - <area code> - <phone>.
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("ext.:");
   field.name = ASCIIToUTF16("dayphone4");
   field.max_length = 0;
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
   ASSERT_EQ(4U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   // Area code.
   EXPECT_EQ(PHONE_HOME_CITY_CODE, form_structure->field(0)->heuristic_type());
   // Phone number suffix.
   EXPECT_EQ(PHONE_HOME_NUMBER,
             form_structure->field(1)->heuristic_type());
@@ skipping 25 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Expiration Date");
   field.name = ASCIIToUTF16("expiration_month");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Expiration Year");
   field.name = ASCIIToUTF16("expiration_year");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(5U, form_structure->field_count());
   EXPECT_EQ(5U, form_structure->autofill_count());
 
   // Name on Card.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Address.
@@ skipping 32 matching lines @@
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("ccexpiresyear");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("cvc number");
   field.name = ASCIIToUTF16("csc");
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(6U, form_structure->field_count());
   ASSERT_EQ(5U, form_structure->autofill_count());
 
   // Card Number.
   EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(0)->heuristic_type());
   // First name, taken as name on card.
@@ skipping 38 matching lines @@
   form.fields.push_back(field);
 
   // Add checkable field.
   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::string()));
+  forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
   const char * const kSignature1 = "11337937696949187602";
   const char * const kResponse1 =
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillquery "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" accepts=\"e\"><form "
       "signature=\"11337937696949187602\"><field signature=\"412125936\"/>"
       "<field signature=\"1917667676\"/><field signature=\"2226358947\"/>"
       "<field signature=\"747221617\"/><field signature=\"4108155786\"/></form>"
       "</autofillquery>";
   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, std::string()));
+  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, std::string()));
+  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 * const kSignature2 = "8308881815906226214";
   EXPECT_EQ(kSignature2, encoded_signatures[1]);
   const char * const kResponse2 =
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"\?><autofillquery "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" accepts=\"e\"><form "
@@ skipping 10 matching lines @@
 
   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, std::string()));
+  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, std::string()));
+  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);
-
-  // Check the behaviour with autocheckout enabled.
-  ScopedVector<FormStructure> checkable_forms;
-  checkable_forms.push_back(
-      new FormStructure(form, "https://www.sample1.com/query/path"));
-
-  ASSERT_TRUE(FormStructure::EncodeQueryRequest(checkable_forms.get(),
-                                                &encoded_signatures,
-                                                &encoded_xml));
-  const char * const kSignature3 = "7747357776717901584";
-  const char * const kResponse3 =
-      "<?xml version=\"1.0\" encoding=\"UTF-8\"?><autofillquery "
-      "clientversion=\"6.1.1715.1442/en (GGLL)\" accepts=\"a,e\" "
-      "urlprefixsignature=\"7648393911063090788\">"
-      "<form signature=\"7747357776717901584\">"
-      "<field signature=\"412125936\"/>"
-      "<field signature=\"1917667676\"/><field signature=\"2226358947\"/><field"
-      " signature=\"747221617\"/><field signature=\"4108155786\"/><field "
-      "signature=\"3410250678\"/><field signature=\"509334676\"/><field "
-      "signature=\"509334676\"/><field signature=\"509334676\"/><field "
-      "signature=\"509334676\"/><field signature=\"509334676\"/></form>"
-      "</autofillquery>";
-  ASSERT_EQ(1U, encoded_signatures.size());
-  EXPECT_EQ(kSignature3, encoded_signatures[0]);
-  EXPECT_EQ(kResponse3, encoded_xml);
 }
 
 TEST(FormStructureTest, EncodeUploadRequest) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   form.fields.push_back(field);
   possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_FIRST);
@@ skipping 27 matching lines @@
 
   // Add checkable field.
   FormFieldData checkable_field;
   checkable_field.is_checkable = true;
   checkable_field.label = ASCIIToUTF16("Checkable1");
   checkable_field.name = ASCIIToUTF16("Checkable1");
   form.fields.push_back(checkable_field);
   possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  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]);
 
   ServerFieldTypeSet 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);
@@ skipping 37 matching lines @@
     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, std::string()));
+  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=\"7816485729218079147\" autofillused=\"false\" "
             "datapresent=\"144200030e\">"
@@ skipping 18 matching lines @@
     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, std::string()));
+  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_FALSE(form_structure->EncodeUploadRequest(available_field_types, false,
                                                    &encoded_xml));
 }
 
 TEST(FormStructureTest, EncodeFieldAssignments) {
   scoped_ptr<FormStructure> form_structure;
   std::vector<ServerFieldTypeSet> possible_field_types;
   FormData form;
   form.method = ASCIIToUTF16("post");
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes(TestAutofillMetrics());
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("firstname");
   form.fields.push_back(field);
   possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_FIRST);
@@ skipping 27 matching lines @@
 
   // Add checkable field.
   FormFieldData checkable_field;
   checkable_field.is_checkable = true;
   checkable_field.label = ASCIIToUTF16("Checkable1");
   checkable_field.name = ASCIIToUTF16("Checkable1");
   form.fields.push_back(checkable_field);
   possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_COUNTRY);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  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]);
 
   ServerFieldTypeSet 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);
@@ skipping 24 matching lines @@
     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, std::string()));
+  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\"?>"
       "<fieldassignments formsignature=\"7816485729218079147\">"
       "<fields fieldid=\"3763331450\" fieldtype=\"3\" name=\"firstname\"/>"
@@ skipping 28 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("last");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Email");
   field.name = ASCIIToUTF16("email");
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
 
   ServerFieldTypeSet unknown_type;
   unknown_type.insert(UNKNOWN_TYPE);
   for (size_t i = 0; i < form_structure.field_count(); ++i)
     form_structure.field(i)->set_possible_types(unknown_type);
 
   // No available types.
   // datapresent should be "" == trimmmed(0x0000000000000000) ==
   //     0b0000000000000000000000000000000000000000000000000000000000000000
   ServerFieldTypeSet available_field_types;
@@ skipping 245 matching lines @@
   form.fields.push_back(field);
   possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(NAME_LAST);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("address");
   form.fields.push_back(field);
   possible_field_types.push_back(ServerFieldTypeSet());
   possible_field_types.back().insert(ADDRESS_HOME_LINE1);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  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,
                                                   &encoded_xml));
   EXPECT_EQ("<\?xml version=\"1.0\" encoding=\"UTF-8\"\?>"
             "<autofillupload clientversion=\"6.1.1715.1442/en (GGLL)\""
@@ skipping 75 matching lines @@
   field.label = ASCIIToUTF16("First Name");
   field.name = ASCIIToUTF16("first");
   form.fields.push_back(field);
 
   // Password fields shouldn't affect the signature.
   field.label = ASCIIToUTF16("Password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
 
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("://&&email&first")),
       form_structure->FormSignature());
 
   form.origin = GURL(std::string("http://www.facebook.com"));
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("http://www.facebook.com&&email&first")),
       form_structure->FormSignature());
 
   form.action = GURL(std::string("https://login.facebook.com/path"));
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   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, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first")),
       form_structure->FormSignature());
 
   field.label = ASCIIToUTF16("Random Field label");
   field.name = ASCIIToUTF16("random1234");
   field.form_control_type = "text";
   form.fields.push_back(field);
   field.label = ASCIIToUTF16("Random Field label2");
   field.name = ASCIIToUTF16("random12345");
   form.fields.push_back(field);
   field.label = ASCIIToUTF16("Random Field label3");
   field.name = ASCIIToUTF16("1random12345678");
   form.fields.push_back(field);
   field.label = ASCIIToUTF16("Random Field label3");
   field.name = ASCIIToUTF16("12345random");
   form.fields.push_back(field);
-  form_structure.reset(new FormStructure(form, std::string()));
+  form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first&"
                   "random1234&random&1random&random")),
       form_structure->FormSignature());
 
 }
 
 TEST(FormStructureTest, ToFormData) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
@@ skipping 10 matching lines @@
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("Submit");
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
-  EXPECT_EQ(form, FormStructure(form, std::string()).ToFormData());
+  EXPECT_EQ(form, FormStructure(form).ToFormData());
 
   // Currently |FormStructure(form_data)ToFormData().user_submitted| is always
   // false. This forces a future author that changes this to update this test.
   form.user_submitted = true;
-  EXPECT_NE(form, FormStructure(form, std::string()).ToFormData());
+  EXPECT_NE(form, FormStructure(form).ToFormData());
 }
 
 TEST(FormStructureTest, SkipFieldTest) {
   FormData form;
   form.name = ASCIIToUTF16("the-name");
   form.method = ASCIIToUTF16("POST");
   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";
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("password");
   field.name = ASCIIToUTF16("password");
   field.form_control_type = "password";
   form.fields.push_back(field);
 
   field.label = base::string16();
   field.name = ASCIIToUTF16("email");
   field.form_control_type = "text";
   form.fields.push_back(field);
 
   ScopedVector<FormStructure> forms;
-  forms.push_back(new FormStructure(form, std::string()));
+  forms.push_back(new FormStructure(form));
   std::vector<std::string> encoded_signatures;
   std::string encoded_xml;
 
   const char * const kSignature = "18006745212084723782";
   const char * const kResponse =
       "<\?xml version=\"1.0\" encoding=\"UTF-8\"?><autofillquery "
       "clientversion=\"6.1.1715.1442/en (GGLL)\" accepts=\"e\"><form "
       "signature=\"18006745212084723782\"><field signature=\"239111655\"/>"
       "<field signature=\"420638584\"/></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);
-
-  AutocheckoutPageMetaData page_meta_data;
-  const char * const kServerResponse =
-      "<autofillqueryresponse><field autofilltype=\"3\" />"
-      "<field autofilltype=\"9\" /></autofillqueryresponse>";
-  FormStructure::ParseQueryResponse(kServerResponse, forms.get(),
-                                    &page_meta_data, TestAutofillMetrics());
-  ASSERT_EQ(NAME_FIRST, forms[0]->field(0)->server_type());
-  ASSERT_EQ(NO_SERVER_DATA, forms[0]->field(1)->server_type());
-  ASSERT_EQ(EMAIL_ADDRESS, forms[0]->field(2)->server_type());
 }
 
 }  // namespace autofill