AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/string16.h"
@@ skipping 67 matching lines @@
     profile = new AutoFillProfile;
     autofill_unittest::SetProfileInfo(profile, "Empty", "", "", "", "", "", "",
                                       "", "", "", "", "", "", "");
     profiles->push_back(profile);
   }
 
   void CreateTestCreditCards(ScopedVector<CreditCard>* credit_cards) {
     CreditCard* credit_card = new CreditCard;
     autofill_unittest::SetCreditCardInfo(credit_card, "First", "Elvis Presley",
                                          "Visa", "1234567890123456", "04",
-                                         "2012", "456", "Home", "");
+                                         "2012", "Home");
     credit_cards->push_back(credit_card);
     credit_card = new CreditCard;
     autofill_unittest::SetCreditCardInfo(credit_card, "Second", "Buddy Holly",
                                          "Mastercard", "0987654321098765", "10",
-                                         "2014", "678", "", "");
+                                         "2014", "");
     credit_cards->push_back(credit_card);
     credit_card = new CreditCard;
     autofill_unittest::SetCreditCardInfo(credit_card, "Empty", "", "", "", "",
-                                         "", "", "", "");
+                                         "", "");
     credit_cards->push_back(credit_card);
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestPersonalDataManager);
 };
 
 class TestAutoFillManager : public AutoFillManager {
  public:
   explicit TestAutoFillManager(TabContents* tab_contents)
       : AutoFillManager(tab_contents, NULL) {
@@ skipping 10 matching lines @@
   void AddSemicolonAutoFillProfile() {
     test_personal_data_->AddSemicolonAutoFillProfile();
   }
 
  private:
   scoped_refptr<TestPersonalDataManager> test_personal_data_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutoFillManager);
 };
 
-void CreateTestFormField(const char* label,
-                         const char* name,
-                         const char* value,
-                         const char* type,
-                         webkit_glue::FormField* field) {
-  *field = webkit_glue::FormField(ASCIIToUTF16(label), ASCIIToUTF16(name),
-                                  ASCIIToUTF16(value), ASCIIToUTF16(type), 0);
-}
-
 void CreateTestFormData(FormData* form) {
   form->name = ASCIIToUTF16("MyForm");
   form->method = ASCIIToUTF16("POST");
   form->origin = GURL("http://myform.com/form.html");
   form->action = GURL("http://myform.com/submit.html");
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Last Name", "lastname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Address Line 1", "addr1", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Address Line 1", "addr1", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Address Line 2", "addr2", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Address Line 2", "addr2", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("City", "city", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "City", "city", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("State", "state", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "State", "state", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Postal Code", "zipcode", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Postal Code", "zipcode", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Country", "country", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Country", "country", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Phone Number", "phonenumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Phone Number", "phonenumber", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Email", "email", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "", "text", &field);
   form->fields.push_back(field);
 }
 
 void CreateTestFormDataBilling(FormData* form) {
   form->name = ASCIIToUTF16("MyForm");
   form->method = ASCIIToUTF16("POST");
   form->origin = GURL("http://myform.com/form.html");
   form->action = GURL("http://myform.com/submit.html");
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Last Name", "lastname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Address Line 1", "billingAddr1", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Address Line 1", "billingAddr1", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Address Line 2", "billingAddr2", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Address Line 2", "billingAddr2", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("City", "billingCity", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "City", "billingCity", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("State", "billingState", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "State", "billingState", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Postal Code", "billingZipcode", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Postal Code", "billingZipcode", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Country", "billingCountry", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Country", "billingCountry", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Phone Number", "phonenumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Phone Number", "phonenumber", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Email", "email", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Name on Card", "nameoncard", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Name on Card", "nameoncard", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Card Number", "cardnumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Card Number", "cardnumber", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("Expiration Date", "ccmonth", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Expiration Date", "ccmonth", "", "text", &field);
   form->fields.push_back(field);
-  CreateTestFormField("", "ccyear", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "", "ccyear", "", "text", &field);
   form->fields.push_back(field);
 }
 
 class AutoFillManagerTest : public RenderViewHostTestHarness {
  public:
   AutoFillManagerTest() {}
 
   virtual void SetUp() {
     RenderViewHostTestHarness::SetUp();
     autofill_manager_.reset(new TestAutoFillManager(contents()));
@@ skipping 53 matching lines @@
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]);
@@ skipping 10 matching lines @@
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "E", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "E", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(1U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]);
   ASSERT_EQ(1U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("Home"), labels[0]);
 }
 
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) {
   FormData form;
   CreateTestFormDataBilling(&form);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("Card Number", "cardnumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Card Number", "cardnumber", "", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(6U, values.size());
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[0]);
@@ skipping 18 matching lines @@
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("Card Number", "cardnumber", "1", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Card Number", "cardnumber", "1", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(3U, values.size());
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[0]);
@@ skipping 12 matching lines @@
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("Name on Card", "nameoncard", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Name on Card", "nameoncard", "", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(6U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[0]);
@@ skipping 20 matching lines @@
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("Name on Card", "nameoncard", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Name on Card", "nameoncard", "", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(8U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[0]);
@@ skipping 22 matching lines @@
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "", "text", &field);
   EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, true, field));
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]);
@@ skipping 24 matching lines @@
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   ASSERT_EQ(15U, results.fields.size());
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "Elvis", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "Elvis", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0]));
-  CreateTestFormField("Middle Name", "middlename", "Aaron", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "Aaron", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1]));
-  CreateTestFormField("Last Name", "lastname", "Presley", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "Presley", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2]));
-  CreateTestFormField("Address Line 1", "billingAddr1",
+  autofill_unittest::CreateTestFormField(
+      "Address Line 1", "billingAddr1",
                       "3734 Elvis Presley Blvd.", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Address Line 2", "billingAddr2", "Apt. 10", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[4]));
-  CreateTestFormField("City", "billingCity", "Memphis", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "City", "billingCity", "Memphis", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[5]));
-  CreateTestFormField("State", "billingState", "Tennessee", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "State", "billingState", "Tennessee", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[6]));
-  CreateTestFormField("Postal Code", "billingZipcode", "38116", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Postal Code", "billingZipcode", "38116", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[7]));
-  CreateTestFormField("Country", "billingCountry", "USA", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Country", "billingCountry", "USA", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[8]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Phone Number", "phonenumber", "12345678901", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[9]));
-  CreateTestFormField("Email", "email", "theking@gmail.com", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "theking@gmail.com", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[10]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Name on Card", "nameoncard", "Elvis Presley", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[11]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Card Number", "cardnumber", "1234567890123456", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[12]));
-  CreateTestFormField("Expiration Date", "ccmonth", "04", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Expiration Date", "ccmonth", "04", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[13]));
-  CreateTestFormField("", "ccyear", "2012", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "", "ccyear", "2012", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[14]));
 }
 
 TEST_F(AutoFillManagerTest, FillNonBillingFormSemicolon) {
   AddSemicolonAutoFillProfile();
 
   FormData form;
   CreateTestFormData(&form);
 
   // Set up our FormStructures.
@@ skipping 13 matching lines @@
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   ASSERT_EQ(11U, results.fields.size());
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "Joe", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "Joe", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0]));
-  CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1]));
-  CreateTestFormField("Last Name", "lastname", "Ely", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "Ely", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Address Line 1", "addr1", "916 16th St.", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Address Line 2", "addr2", "Apt. 6", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[4]));
-  CreateTestFormField("City", "city", "Lubbock", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "City", "city", "Lubbock", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[5]));
-  CreateTestFormField("State", "state", "Texas", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "State", "state", "Texas", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[6]));
-  CreateTestFormField("Postal Code", "zipcode", "79401", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Postal Code", "zipcode", "79401", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[7]));
-  CreateTestFormField("Country", "country", "USA", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Country", "country", "USA", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[8]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Phone Number", "phonenumber", "12345678901", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[9]));
-  CreateTestFormField("Email", "email", "flatlander@gmail.com", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "flatlander@gmail.com", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[10]));
 }
 
 TEST_F(AutoFillManagerTest, FillBillFormSemicolon) {
   AddSemicolonAutoFillProfile();
 
   FormData form;
   CreateTestFormDataBilling(&form);
 
   // Set up our FormStructures.
@@ skipping 10 matching lines @@
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   ASSERT_EQ(15U, results.fields.size());
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "Joe", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "Joe", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0]));
-  CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1]));
-  CreateTestFormField("Last Name", "lastname", "Ely", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "Ely", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2]));
-  CreateTestFormField("Address Line 1", "billingAddr1",
+  autofill_unittest::CreateTestFormField(
+      "Address Line 1", "billingAddr1",
                       "3734 Elvis Presley Blvd.", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Address Line 2", "billingAddr2", "Apt. 10", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[4]));
-  CreateTestFormField("City", "billingCity", "Memphis", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "City", "billingCity", "Memphis", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[5]));
-  CreateTestFormField("State", "billingState", "Tennessee", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "State", "billingState", "Tennessee", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[6]));
-  CreateTestFormField("Postal Code", "billingZipcode", "38116", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Postal Code", "billingZipcode", "38116", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[7]));
-  CreateTestFormField("Country", "billingCountry", "USA", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Country", "billingCountry", "USA", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[8]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Phone Number", "phonenumber", "12345678901", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[9]));
-  CreateTestFormField("Email", "email", "flatlander@gmail.com", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "flatlander@gmail.com", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[10]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Name on Card", "nameoncard", "Elvis Presley", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[11]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Card Number", "cardnumber", "1234567890123456", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[12]));
-  CreateTestFormField("Expiration Date", "ccmonth", "04", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Expiration Date", "ccmonth", "04", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[13]));
-  CreateTestFormField("", "ccyear", "2012", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "", "ccyear", "2012", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[14]));
 }
 
 TEST_F(AutoFillManagerTest, FillPhoneNumberTest) {
   FormData form;
 
   form.name = ASCIIToUTF16("MyPhoneForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/phone_form.html");
   form.action = GURL("http://myform.com/phone_submit.html");
 
   webkit_glue::FormField field;
 
-  CreateTestFormField("country code", "country code", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "country code", "country code", "", "text", &field);
   field.set_size(1);
   form.fields.push_back(field);
-  CreateTestFormField("area code", "area code", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "area code", "area code", "", "text", &field);
   field.set_size(3);
   form.fields.push_back(field);
-  CreateTestFormField("phone", "phone prefix", "1", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "phone", "phone prefix", "1", "text", &field);
   field.set_size(3);
   form.fields.push_back(field);
-  CreateTestFormField("-", "phone suffix", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "-", "phone suffix", "", "text", &field);
   field.set_size(4);
   form.fields.push_back(field);
-  CreateTestFormField("Phone Extension", "ext", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Phone Extension", "ext", "", "text", &field);
   field.set_size(3);
   form.fields.push_back(field);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   AutoFillProfile *work_profile = autofill_manager_->GetLabeledProfile("Work");
   EXPECT_TRUE(work_profile != NULL);
@@ skipping 30 matching lines @@
 }
 
 TEST_F(AutoFillManagerTest, FormChangesRemoveField) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "", "text", &field);
   form.fields.push_back(field);
-  CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "", "text", &field);
   form.fields.push_back(field);
-  CreateTestFormField("Last Name", "lastname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "", "text", &field);
   form.fields.push_back(field);
-  CreateTestFormField("Phone Number", "phonenumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Phone Number", "phonenumber", "", "text", &field);
   form.fields.push_back(field);
-  CreateTestFormField("Email", "email", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "", "text", &field);
   form.fields.push_back(field);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // Now, after the call to |FormsSeen| we remove the phone number field before
   // filling.
   form.fields.erase(form.fields.begin() + 3);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
   EXPECT_TRUE(
       autofill_manager_->FillAutoFillFormData(kPageID,
                                               form,
                                               ASCIIToUTF16("Elvis"),
                                               ASCIIToUTF16("Home")));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   ASSERT_EQ(4U, results.fields.size());
 
-  CreateTestFormField("First Name", "firstname", "Elvis", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "Elvis", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0]));
-  CreateTestFormField("Middle Name", "middlename", "Aaron", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "Aaron", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1]));
-  CreateTestFormField("Last Name", "lastname", "Presley", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "Presley", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Email", "email", "theking@gmail.com", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3]));
 }
 
 TEST_F(AutoFillManagerTest, FormChangesAddField) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
 
   webkit_glue::FormField field;
-  CreateTestFormField("First Name", "firstname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "", "text", &field);
   form.fields.push_back(field);
-  CreateTestFormField("Middle Name", "middlename", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "", "text", &field);
   form.fields.push_back(field);
-  CreateTestFormField("Last Name", "lastname", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "", "text", &field);
   // Note: absent phone number.  Adding this below.
   form.fields.push_back(field);
-  CreateTestFormField("Email", "email", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Email", "email", "", "text", &field);
   form.fields.push_back(field);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // Now, after the call to |FormsSeen| we add the phone number field before
   // filling.
-  CreateTestFormField("Phone Number", "phonenumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Phone Number", "phonenumber", "", "text", &field);
   form.fields.insert(form.fields.begin() + 3, field);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
   EXPECT_TRUE(
       autofill_manager_->FillAutoFillFormData(kPageID,
                                               form,
                                               ASCIIToUTF16("Elvis"),
                                               ASCIIToUTF16("Home")));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   ASSERT_EQ(5U, results.fields.size());
 
-  CreateTestFormField("First Name", "firstname", "Elvis", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "First Name", "firstname", "Elvis", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[0]));
-  CreateTestFormField("Middle Name", "middlename", "Aaron", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Middle Name", "middlename", "Aaron", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[1]));
-  CreateTestFormField("Last Name", "lastname", "Presley", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Last Name", "lastname", "Presley", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[2]));
-  CreateTestFormField("Phone Number", "phonenumber", "", "text", &field);
+  autofill_unittest::CreateTestFormField(
+      "Phone Number", "phonenumber", "", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[3]));
-  CreateTestFormField(
+  autofill_unittest::CreateTestFormField(
       "Email", "email", "theking@gmail.com", "text", &field);
   EXPECT_TRUE(field.StrictlyEqualsHack(results.fields[4]));
 }
 
-TEST_F(AutoFillManagerTest, InfoBarShown) {
-  FormData form;
-  form.name = ASCIIToUTF16("MyForm");
-  form.method = ASCIIToUTF16("POST");
-  form.origin = GURL("http://myform.com/form.html");
-  form.action = GURL("http://myform.com/submit.html");
-
-  webkit_glue::FormField field;
-  CreateTestFormField("E-mail", "one", "one", "text", &field);
-  form.fields.push_back(field);
-  CreateTestFormField("E-mail", "two", "two", "text", &field);
-  form.fields.push_back(field);
-  CreateTestFormField("E-mail", "three", "three", "text", &field);
-  form.fields.push_back(field);
-
-  // Set up our FormStructures.
-  std::vector<FormData> forms;
-  forms.push_back(form);
-  autofill_manager_->FormsSeen(forms);
-
-  // Submit the form.
-  autofill_manager_->FormSubmitted(form);
-
-  // Check that the 'AutoFill InfoBar shown' pref is set.
-  PrefService* prefs = profile()->GetPrefs();
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kAutoFillInfoBarShown));
-}
-
 TEST_F(AutoFillManagerTest, HiddenFields) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
 
   webkit_glue::FormField field;
-  CreateTestFormField("E-mail", "one", "one", "hidden", &field);
+  autofill_unittest::CreateTestFormField(
+      "E-mail", "one", "one", "hidden", &field);
   form.fields.push_back(field);
-  CreateTestFormField("E-mail", "two", "two", "hidden", &field);
+  autofill_unittest::CreateTestFormField(
+      "E-mail", "two", "two", "hidden", &field);
   form.fields.push_back(field);
-  CreateTestFormField("E-mail", "three", "three", "hidden", &field);
+  autofill_unittest::CreateTestFormField(
+      "E-mail", "three", "three", "hidden", &field);
   form.fields.push_back(field);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // Submit the form.
   autofill_manager_->FormSubmitted(form);
 
-  // Check that the 'AutoFill InfoBar shown' pref is not set.
-  PrefService* prefs = profile()->GetPrefs();
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kAutoFillInfoBarShown));
+  // TODO(jhawkins): We can't use the InfoBar anymore to determine if we saved
+  // fields.  Need to query the PDM.
 }
 
 }  // namespace