Remove autocheckout code.

components/autofill/core/browser/personal_data_manager_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 <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 578 matching lines @@
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Address:", "address1", "21 Laussat St", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 20 matching lines @@
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Address:", "address1", "21 Laussat St", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure,
                                               &imported_credit_card));
   ASSERT_EQ(static_cast<CreditCard*>(NULL), imported_credit_card);
 
   const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
   ASSERT_EQ(0U, results.size());
 }
 
@@ skipping 12 matching lines @@
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Email:", "email", "example@example.com", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Confirm email:", "confirm_email", "example@example.com", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
   ASSERT_EQ(1U, results.size());
 }
 
 // Tests two email fields containing different values blocks provile import.
 TEST_F(PersonalDataManagerTest, ImportFormDataTwoDifferentEmails) {
@@ skipping 10 matching lines @@
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Email:", "email", "example@example.com", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Email:", "email2", "example2@example.com", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure,
                                               &imported_credit_card));
   const std::vector<AutofillProfile*>& results = personal_data_->GetProfiles();
   ASSERT_EQ(0U, results.size());
 }
 
 TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) {
   FormData form;
   FormFieldData field;
   test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Last name:", "last_name", "Washington", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Card number:", "card_number", "4111 1111 1111 1111", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
   ASSERT_EQ(0U, profiles.size());
   const std::vector<CreditCard*>& cards = personal_data_->GetCreditCards();
   ASSERT_EQ(0U, cards.size());
@@ skipping 10 matching lines @@
       "Address:", "address", "1600 Pennsylvania Avenue", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Washington", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "DC", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "20500", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Country:", "country", "USA", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                               &imported_credit_card));
   const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
   ASSERT_EQ(1U, profiles.size());
 }
 
 TEST_F(PersonalDataManagerTest, ImportFormMinimumAddressGB) {
   // British addresses do not require a state/province as the county is usually
   // not requested on forms.
   FormData form;
   FormFieldData field;
   test::CreateTestFormField("Name:", "name", "David Cameron", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Address:", "address", "10 Downing Street", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "London", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Postcode:", "postcode", "SW1A 2AA", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Country:", "country", "United Kingdom", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                               &imported_credit_card));
   const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
   ASSERT_EQ(1U, profiles.size());
 }
 
 TEST_F(PersonalDataManagerTest, ImportFormMinimumAddressGI) {
   // Gibraltar has the most minimal set of requirements for a valid address.
   // There are no cities or provinces and no postal/zip code system.
   FormData form;
   FormFieldData field;
   test::CreateTestFormField(
       "Name:", "name", "Sir Adrian Johns", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Address:", "address", "The Convent, Main Street", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Country:", "country", "Gibraltar", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                               &imported_credit_card));
   const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
   ASSERT_EQ(1U, profiles.size());
 }
 
 TEST_F(PersonalDataManagerTest, ImportPhoneNumberSplitAcrossMultipleFields) {
   FormData form;
@@ skipping 18 matching lines @@
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Address:", "address1", "21 Laussat St", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 59 matching lines @@
   test::CreateTestFormField(
       "Address:", "address1", "21 Laussat St", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 20 matching lines @@
   test::CreateTestFormField(
       "Address:", "address1", "22 Laussat St", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 23 matching lines @@
   test::CreateTestFormField(
       "Address:", "address1", "21 Laussat St", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 19 matching lines @@
   test::CreateTestFormField(
       "Address:", "address1", "21 Laussat St", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 32 matching lines @@
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Email:", "email", "theprez@gmail.com", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Phone:", "phone", "6505556666", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 30 matching lines @@
   test::CreateTestFormField(
       "Email:", "email", "theprez@gmail.com", "text", &field);
   form2.fields.push_back(field);
   // Country gets added.
   test::CreateTestFormField("Country:", "country", "USA", "text", &field);
   form2.fields.push_back(field);
   // Phone gets updated.
   test::CreateTestFormField("Phone:", "phone", "6502231234", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 21 matching lines @@
   test::CreateTestFormField(
       "Address Line 1:", "address", "190 High Street", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Philadelphia", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "Pennsylvania", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zipcode", "19106", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 20 matching lines @@
   test::CreateTestFormField(
       "Address Line 1:", "address", "190 High Street", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Philadelphia", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "Pennsylvania", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zipcode", "19106", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 25 matching lines @@
   test::CreateTestFormField(
       "Address Line 1:", "address", "190 High Street", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Philadelphia", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "Pennsylvania", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zipcode", "19106", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 21 matching lines @@
   test::CreateTestFormField(
       "Address Line 1:", "address", "190 High Street", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Philadelphia", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "Pennsylvania", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zipcode", "19106", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 18 matching lines @@
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Email:", "email", "theprez@gmail.com", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Address Line 1:", "address", "190 High Street", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Philadelphia", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure1,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
@@ skipping 33 matching lines @@
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "CA", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Phone:", "phone", "4158889999", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Note: No refresh.
 
   // Expect no change.
   const std::vector<AutofillProfile*>& web_profiles =
@@ skipping 12 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_TRUE(imported_credit_card);
   personal_data_->SaveImportedCreditCard(*imported_credit_card);
   delete imported_credit_card;
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
@@ skipping 13 matching lines @@
       "Name on card:", "name_on_card", "", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "5500 0000 0000 0004", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "02", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_TRUE(imported_credit_card);
   personal_data_->SaveImportedCreditCard(*imported_credit_card);
   delete imported_credit_card;
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
@@ skipping 16 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_TRUE(imported_credit_card);
   personal_data_->SaveImportedCreditCard(*imported_credit_card);
   delete imported_credit_card;
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
@@ skipping 13 matching lines @@
       "Name on card:", "name_on_card", "Jim Johansen", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "1000000000000000", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "02", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure2,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
   const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
@@ skipping 10 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_TRUE(imported_credit_card);
   personal_data_->SaveImportedCreditCard(*imported_credit_card);
   delete imported_credit_card;
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
@@ skipping 14 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111 1111 1111 1111", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 16 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_TRUE(imported_credit_card);
   personal_data_->SaveImportedCreditCard(*imported_credit_card);
   delete imported_credit_card;
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
@@ skipping 10 matching lines @@
   // Add a second credit card with no number.
   FormData form2;
   test::CreateTestFormField(
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure2,
                                               &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
   // No change is expected.
@@ skipping 14 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_TRUE(imported_credit_card);
   personal_data_->SaveImportedCreditCard(*imported_credit_card);
   delete imported_credit_card;
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
@@ skipping 12 matching lines @@
   FormData form2;
   // Note missing name.
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111111111111111", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
   // No change is expected.
   CreditCard expected2(base::GenerateGUID(), "https://www.example.com");
   test::SetCreditCardInfo(&expected2,
       "Biggie Smalls", "4111111111111111", "01", "2011");
   const std::vector<CreditCard*>& results2 = personal_data_->GetCreditCards();
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected2.Compare(*results2[0]));
 
   // Add a third credit card where the expiration date is missing.
   FormData form3;
   test::CreateTestFormField(
       "Name on card:", "name_on_card", "Johnny McEnroe", "text", &field);
   form3.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "5555555555554444", "text", &field);
   form3.fields.push_back(field);
   // Note missing expiration month and year..
 
-  FormStructure form_structure3(form3, std::string());
+  FormStructure form_structure3(form3);
   form_structure3.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure3,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
   // No change is expected.
@@ skipping 31 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2012", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 34 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2011", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
@@ skipping 37 matching lines @@
   test::CreateTestFormField(
       "Address:", "address1", "123 Zoo St.", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("City:", "city", "Hollywood", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "CA", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "91601", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Wait for the refresh, which in this case is a no-op.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 29 matching lines @@
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField(
       "Card Number:", "card_number", "4111 1111 1111 1111", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Exp Month:", "exp_month", "01", "text", &field);
   form.fields.push_back(field);
   test::CreateTestFormField("Exp Year:", "exp_year", "2012", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form, std::string());
+  FormStructure form_structure(form);
   form_structure.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Since no refresh is expected, reload the data from the database to make
   // sure no changes were written out.
   ResetPersonalDataManager();
 
@@ skipping 262 matching lines @@
   form1.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
   test::CreateTestFormField(
       "Phone number:", "phone_number", "817-555-6789", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1, std::string());
+  FormStructure form_structure1(form1);
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure1,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
@@ skipping 23 matching lines @@
   test::CreateTestFormField("City:", "city", "San Francisco", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("State:", "state", "California", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField("Zip:", "zip", "94102", "text", &field);
   form2.fields.push_back(field);
   test::CreateTestFormField(
       "Phone number:", "phone_number", "214-555-1234", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2, std::string());
+  FormStructure form_structure2(form2);
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Verify that the web database has been updated and the notification sent.
   EXPECT_CALL(personal_data_observer_,
               OnPersonalDataChanged()).WillOnce(QuitUIMessageLoop());
   base::MessageLoop::current()->Run();
 
@@ skipping 73 matching lines @@
   // Removing shouldn't work.
   personal_data_->RemoveByGUID(steve_jobs.guid());
   personal_data_->RemoveByGUID(bill_gates.guid());
 
   ResetPersonalDataManager();
   EXPECT_EQ(1U, personal_data_->GetProfiles().size());
   EXPECT_EQ(1U, personal_data_->GetCreditCards().size());
 }
 
 }  // namespace autofill