Download autocheckout whitelist and enable autocheckout for whitelisted sites only.

chrome/browser/autofill/personal_data_manager_unittest.cc

 // Copyright (c) 2012 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.h"
@@ skipping 500 matching lines @@
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 24 matching lines @@
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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());
 }
 
 TEST_F(PersonalDataManagerTest, ImportFormDataNotEnoughFilledFields) {
   FormData form;
   FormFieldData field;
   autofill_test::CreateTestFormField(
       "First name:", "first_name", "George", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Last name:", "last_name", "Washington", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Card number:", "card_number", "4111 1111 1111 1111", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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*>& credit_cards = personal_data_->credit_cards();
   ASSERT_EQ(0U, credit_cards.size());
@@ skipping 25 matching lines @@
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 62 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 23 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
@@ skipping 26 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 23 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "San Francisco", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
@@ skipping 36 matching lines @@
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Email:", "email", "theprez@gmail.com", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Phone:", "phone", "6505556666", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 35 matching lines @@
   form2.fields.push_back(field);
   // Country gets added.
   autofill_test::CreateTestFormField(
       "Country:", "country", "USA", "text", &field);
   form2.fields.push_back(field);
   // Phone gets updated.
   autofill_test::CreateTestFormField(
       "Phone:", "phone", "6502231234", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
@@ skipping 24 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "Philadelphia", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "Pennsylvania", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zipcode", "19106", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 23 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "Philadelphia", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "Pennsylvania", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zipcode", "19106", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
@@ skipping 28 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "Philadelphia", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "Pennsylvania", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zipcode", "19106", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 24 matching lines @@
   autofill_test::CreateTestFormField(
       "City:", "city", "Philadelphia", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "State:", "state", "Pennsylvania", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zipcode", "19106", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
@@ skipping 19 matching lines @@
   autofill_test::CreateTestFormField(
       "Email:", "email", "theprez@gmail.com", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Address Line 1:", "address", "190 High Street", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "City:", "city", "Philadelphia", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   form_structure1.DetermineHeuristicTypes(TestAutofillMetrics());
   const CreditCard* imported_credit_card;
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure1,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Note: no refresh here.
 
   const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
   ASSERT_EQ(0U, profiles.size());
@@ skipping 35 matching lines @@
   autofill_test::CreateTestFormField(
       "State:", "state", "CA", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Phone:", "phone", "4158889999", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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 14 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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 15 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "5500 0000 0000 0004", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "02", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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 19 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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 15 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "1000000000000000", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "02", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure2,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Note: no refresh here.
 
   const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
@@ skipping 10 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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 16 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111 1111 1111 1111", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
@@ skipping 18 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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 @@
   autofill_test::CreateTestFormField(
       "Name on card:", "name_on_card", "Biggie Smalls", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2012", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure2,
                                               &imported_credit_card));
   EXPECT_FALSE(imported_credit_card);
 
   // Note: no refresh here.
 
   // No change is expected.
   CreditCard expected2;
   autofill_test::SetCreditCardInfo(&expected2,
@@ skipping 14 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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 @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111111111111111", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   form_structure2.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_TRUE(personal_data_->ImportFormData(form_structure2,
                                              &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());
   MessageLoop::current()->Run();
 
   // No change is expected.
   CreditCard expected2;
   autofill_test::SetCreditCardInfo(&expected2,
       "Biggie Smalls", "4111111111111111", "01", "2011");
   const std::vector<CreditCard*>& results2 = personal_data_->credit_cards();
   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;
   autofill_test::CreateTestFormField(
       "Name on card:", "name_on_card", "Johnny McEnroe", "text", &field);
   form3.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "5555555555554444", "text", &field);
   form3.fields.push_back(field);
   // Note missing expiration month and year..
 
-  FormStructure form_structure3(form3);
+  FormStructure form_structure3(form3, std::string());
   form_structure3.DetermineHeuristicTypes(TestAutofillMetrics());
   EXPECT_FALSE(personal_data_->ImportFormData(form_structure3,
                                               &imported_credit_card));
   ASSERT_FALSE(imported_credit_card);
 
   // Note: no refresh here.
 
   // No change is expected.
   CreditCard expected3;
   autofill_test::SetCreditCardInfo(&expected3,
@@ skipping 31 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2012", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 36 matching lines @@
   autofill_test::CreateTestFormField(
       "Card Number:", "card_number", "4111-1111-1111-1111", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Month:", "exp_month", "01", "text", &field);
   form.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Exp Year:", "exp_year", "2011", "text", &field);
   form.fields.push_back(field);
 
-  FormStructure form_structure(form);
+  FormStructure form_structure(form, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 145 matching lines @@
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form1.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Phone number:", "phone_number", "817-555-6789", "text", &field);
   form1.fields.push_back(field);
 
-  FormStructure form_structure1(form1);
+  FormStructure form_structure1(form1, std::string());
   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());
   MessageLoop::current()->Run();
@@ skipping 26 matching lines @@
   autofill_test::CreateTestFormField(
       "State:", "state", "California", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Zip:", "zip", "94102", "text", &field);
   form2.fields.push_back(field);
   autofill_test::CreateTestFormField(
       "Phone number:", "phone_number", "214-555-1234", "text", &field);
   form2.fields.push_back(field);
 
-  FormStructure form_structure2(form2);
+  FormStructure form_structure2(form2, std::string());
   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());
   MessageLoop::current()->Run();
 
   const std::vector<AutofillProfile*>& results2 = personal_data_->GetProfiles();
 
   // Modify expected to include multi-valued fields.
   std::vector<string16> values;
   expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values);
   values.push_back(ASCIIToUTF16("(214) 555-1234"));
   expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values);
 
   ASSERT_EQ(1U, results2.size());
   EXPECT_EQ(0, expected.Compare(*results2[0]));
 }