Convert the autofill pyauto tests to browser tests, and remove all the supporting automation hooks …

chrome/browser/autofill/autofill_browsertest.cc

Index: chrome/browser/autofill/autofill_browsertest.cc
===================================================================
--- chrome/browser/autofill/autofill_browsertest.cc	(revision 152261)
+++ chrome/browser/autofill/autofill_browsertest.cc	(working copy)
@@ -5,12 +5,20 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/file_util.h"
+#include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/rand_util.h"
 #include "base/string16.h"
+#include "base/string_number_conversions.h"
+#include "base/string_split.h"
+#include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
+#include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
@@ -27,6 +35,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -71,38 +81,84 @@
     "<label for=\"phone\">Phone number:</label>"
     " <input type=\"text\" id=\"phone\"><br>"
     "</form>";
+static const char* kAutofillEditAddressURL =
+    "chrome://settings-frame/autofillEditAddress";
 
-class WindowedPersonalDataManagerObserver : public PersonalDataManagerObserver {
+class WindowedPersonalDataManagerObserver
+    : public PersonalDataManagerObserver,
+      public content::NotificationObserver {
  public:
-  WindowedPersonalDataManagerObserver() :
-      personal_data_changed_(false),
-      has_run_message_loop_(false) {
+  explicit WindowedPersonalDataManagerObserver(PersonalDataManager* pdm) :
+      alerted_(false),
+      has_run_message_loop_(false),
+      personal_data_manager_(pdm),
+      infobar_helper_(NULL) {
+    personal_data_manager_->SetObserver(this);
+    registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
+                   content::NotificationService::AllSources());
   }
 
+  ~WindowedPersonalDataManagerObserver() {
+    if (!infobar_helper_)
+      return;
+
+    InfoBarDelegate* infobar = NULL;
+    if (infobar_helper_->infobar_count() > 0 &&
+        (infobar = infobar_helper_->GetInfoBarDelegateAt(0))) {
+      infobar_helper_->RemoveInfoBar(infobar);
+    }
+  }
+
   void Wait() {
-    if (!personal_data_changed_) {
+    if (!alerted_) {
       has_run_message_loop_ = true;
       content::RunMessageLoop();
     }
+    personal_data_manager_->RemoveObserver(this);
   }
 
-  void OnPersonalDataChanged() OVERRIDE {
+  // PersonalDataManagerObserver:
+  virtual void OnPersonalDataChanged() OVERRIDE {
     if (has_run_message_loop_) {
       MessageLoopForUI::current()->Quit();
       has_run_message_loop_ = false;
     }
-    personal_data_changed_ = true;
+    alerted_ = true;
   }
 
+  virtual void OnInsufficientFormData() OVERRIDE {
+    OnPersonalDataChanged();
+  }
+
+  // content::NotificationObserver:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE {
+    // Accept in the infobar.
+    infobar_helper_ = content::Source<InfoBarTabHelper>(source).ptr();
+    InfoBarDelegate* infobar = infobar_helper_->GetInfoBarDelegateAt(0);
+
+    ConfirmInfoBarDelegate* confirm_infobar =
+        infobar->AsConfirmInfoBarDelegate();
+    confirm_infobar->Accept();
+  }
+
  private:
-  bool personal_data_changed_;
+  bool alerted_;
   bool has_run_message_loop_;
+  PersonalDataManager* personal_data_manager_;
+  content::NotificationRegistrar registrar_;
+  InfoBarTabHelper* infobar_helper_;
 };
 
 class AutofillTest : public InProcessBrowserTest {
  protected:
   AutofillTest() {}
 
+  PersonalDataManager* personal_data_manager() {
+    return PersonalDataManagerFactory::GetForProfile(browser()->profile());
+  }
+
   void CreateTestProfile() {
     autofill_test::DisableSystemServices(browser()->profile());
 
@@ -112,21 +168,122 @@
         "red.swingline@initech.com", "Initech", "4120 Freidrich Lane",
         "Basement", "Austin", "Texas", "78744", "United States", "5125551234");
 
-    PersonalDataManager* personal_data_manager =
-        PersonalDataManagerFactory::GetForProfile(browser()->profile());
-    ASSERT_TRUE(personal_data_manager);
+    WindowedPersonalDataManagerObserver observer(personal_data_manager());
+    personal_data_manager()->AddProfile(profile);
 
-    WindowedPersonalDataManagerObserver observer;
-    personal_data_manager->SetObserver(&observer);
-
-    personal_data_manager->AddProfile(profile);
-
     // AddProfile is asynchronous. Wait for it to finish before continuing the
     // tests.
     observer.Wait();
-    personal_data_manager->RemoveObserver(&observer);
   }
 
+  void SetProfiles(std::vector<AutofillProfile>* profiles) {
+    WindowedPersonalDataManagerObserver observer(personal_data_manager());
+    personal_data_manager()->SetProfiles(profiles);
+    observer.Wait();
+  }
+
+  void SetProfile(const AutofillProfile& profile) {
+    std::vector<AutofillProfile> profiles;
+    profiles.push_back(profile);
+    SetProfiles(&profiles);
+  }
+
+  void SetCards(std::vector<CreditCard>* cards) {
+    WindowedPersonalDataManagerObserver observer(personal_data_manager());
+    personal_data_manager()->SetCreditCards(cards);
+    observer.Wait();
+  }
+
+  void SetCard(const CreditCard& card) {
+    std::vector<CreditCard> cards;
+    cards.push_back(card);
+    SetCards(&cards);
+  }
+
+  typedef base::hash_map<std::string, std::string> FormData;
+  void FillFormAndSubmit(const std::string filename, const FormData& data) {
+    GURL url = test_server()->GetURL(std::string("files/autofill/") + filename);
+    ui_test_utils::NavigateToURL(browser(), url);
+
+    std::string js;
+    for (FormData::const_iterator i = data.begin(); i != data.end(); ++i) {
+      js += "document.getElementById('" + i->first + "').value = '" +
+            i->second + "';";
+    }
+    js += "document.getElementById('testform').submit();";
+
+    WindowedPersonalDataManagerObserver observer(personal_data_manager());
+    ASSERT_TRUE(
+        content::ExecuteJavaScript(render_view_host(), L"", ASCIIToWide(js)));
+    observer.Wait();
+  }
+
+  void SubmitCreditCard(const char* name,
+                        const char* number,
+                        const char* exp_month,
+                        const char* exp_year) {
+    FormData data;
+    data["CREDIT_CARD_NAME"] = name;
+    data["CREDIT_CARD_NUMBER"] = number;
+    data["CREDIT_CARD_EXP_MONTH"] = exp_month;
+    data["CREDIT_CARD_EXP_4_DIGIT_YEAR"] = exp_year;
+    FillFormAndSubmit("autofill_creditcard_form.html", data);
+  }
+
+  // Populates a webpage form using autofill data and keypress events.
+  // This function focuses the specified input field in the form, and then
+  // sends keypress events to the tab to cause the form to be populated.
+  void PopulateForm(const std::string& field_id) {
+    std::string js("document.getElementById('");
+    js += field_id + "').focus();";
+    ASSERT_TRUE(
+        content::ExecuteJavaScript(render_view_host(), L"", ASCIIToWide(js)));
+
+    SendKeyAndWait(ui::VKEY_DOWN,
+                   chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
+    SendKeyAndWait(ui::VKEY_DOWN,
+                   chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
+    SendKeyAndWait(ui::VKEY_RETURN,
+                   chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
+  }
+
+  // Aggregate profiles from forms into Autofill preferences. Returns the number
+  // of parsed profiles.
+  int AggregateProfilesIntoAutofillPrefs(const std::string& filename) {
+    CHECK(test_server()->Start());
+
+    std::string data;
+    FilePath data_file = ui_test_utils::GetTestFilePath(
+        FilePath().AppendASCII("autofill"), FilePath().AppendASCII(filename));
+    CHECK(file_util::ReadFileToString(data_file, &data));
+    std::vector<std::string> lines;
+    base::SplitString(data, '\n', &lines);
+    for (size_t i = 0; i < lines.size(); ++i) {
+      if (StartsWithASCII(lines[i], "#", false))
+        continue;
+      std::vector<std::string> fields;
+      base::SplitString(lines[i], '|', &fields);
+      CHECK_EQ(12u, fields.size());
+
+      FormData data;
+      data["NAME_FIRST"] = fields[0];
+      data["NAME_MIDDLE"] = fields[1];
+      data["NAME_LAST"] = fields[2];
+      data["EMAIL_ADDRESS"] = fields[3];
+      data["COMPANY_NAME"] = fields[4];
+      data["ADDRESS_HOME_LINE1"] = fields[5];
+      data["ADDRESS_HOME_LINE2"] = fields[6];
+      data["ADDRESS_HOME_CITY"] = fields[7];
+      data["ADDRESS_HOME_STATE"] = fields[8];
+      data["ADDRESS_HOME_ZIP"] = fields[9];
+      data["ADDRESS_HOME_COUNTRY"] = fields[10];
+      data["PHONE_HOME_WHOLE_NUMBER"] = fields[11];
+
+      FillFormAndSubmit("duplicate_profiles_test.html", data);
+    }
+    return lines.size();
+  }
+
   void ExpectFieldValue(const std::wstring& field_name,
                         const std::string& expected_value) {
     std::string value;
@@ -707,3 +864,660 @@
 
   TryBasicFormFill();
 }
+
+// Test filling profiles and overwriting with new profiles.
+IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfile) {
+  // Test getting profiles when none have been filled.
+  ASSERT_TRUE(personal_data_manager()->profiles().empty());
+  ASSERT_TRUE(personal_data_manager()->credit_cards().empty());
+
+  AutofillProfile profile;
+  profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
+  profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
+  profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("94043"));
+  profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("sue@example.com"));
+  profile.SetInfo(COMPANY_NAME, ASCIIToUTF16("Company X"));
+
+  CreditCard credit_card;
+  credit_card.SetInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("6011111111111117"));
+  credit_card.SetInfo(CREDIT_CARD_EXP_MONTH, ASCIIToUTF16("12"));
+  credit_card.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, ASCIIToUTF16("2011"));
+  credit_card.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Bob C. Smith"));
+
+  SetProfile(profile);
+  SetCard(credit_card);
+
+  ASSERT_EQ(1, personal_data_manager()->profiles().size());
+  ASSERT_EQ(profile, *personal_data_manager()->profiles()[0]);
+
+  ASSERT_EQ(1, personal_data_manager()->credit_cards().size());
+  ASSERT_EQ(credit_card, *personal_data_manager()->credit_cards()[0]);
+}
+
+// Test filling a profile with multi-value data.
+IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileMultiValue) {
+  AutofillProfile profile;
+  std::vector<string16> first_names, last_names;
+  first_names.push_back(ASCIIToUTF16("Bob"));
+  first_names.push_back(ASCIIToUTF16("Joe"));
+  profile.SetMultiInfo(NAME_FIRST, first_names);
+  last_names.push_back(ASCIIToUTF16("Smith"));
+  last_names.push_back(ASCIIToUTF16("Jones"));
+  profile.SetMultiInfo(NAME_LAST, last_names);
+  profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("94043"));
+
+  SetProfile(profile);
+  ASSERT_EQ(1, personal_data_manager()->profiles().size());
+  ASSERT_EQ(profile, *personal_data_manager()->profiles()[0]);
+}
+
+// Test filling profiles with unicode strings and crazy characters.
+IN_PROC_BROWSER_TEST_F(AutofillTest, FillProfileCrazyCharacters) {
+  std::vector<AutofillProfile> profiles;
+  AutofillProfile profile1;
+  profile1.SetInfo(NAME_FIRST, WideToUTF16(L"\u0623\u0648\u0628\u0627\u0645\u0627 \u064a\u0639\u062a\u0630\u0631 \u0647\u0627\u062a\u0641\u064a\u0627 \u0644\u0645\u0648\u0638\u0641\u0629 \u0633\u0648\u062f\u0627\u0621 \u0627\u0633\u062a\u0642\u0627\u0644\u062a \u0628\u0633\u0628\u0628 \u062a\u0635\u0631\u064a\u062d\u0627\u062a \u0645\u062c\u062a\u0632\u0623\u0629"));
+  profile1.SetInfo(NAME_MIDDLE, WideToUTF16(L"BANK\xcBERF\xc4LLE"));
+  profile1.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"\uacbd\uc81c \ub274\uc2a4 \ub354\ubcf4\uae30@google.com"));
+  profile1.SetInfo(ADDRESS_HOME_LINE1, WideToUTF16(L"\uad6d\uc815\uc6d0\xb7\uac80\ucc30, \ub178\ubb34\ud604\uc815\ubd80 \ub300\ubd81\uc811\ucd09 \ub2f4\ub2f9 \uc778\uc0ac\ub4e4 \uc870\uc0ac"));
+  profile1.SetInfo(ADDRESS_HOME_CITY, WideToUTF16(L"\u653f\u5e9c\u4e0d\u6392\u9664\u7acb\u6cd5\u898f\u7ba1\u5c0e\u904a"));
+  profile1.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"YOHO_54676"));
+  profile1.SetInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"861088828000"));
+  profile1.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"India"));
+  profiles.push_back(profile1);
+
+  AutofillProfile profile2;
+  profile2.SetInfo(NAME_FIRST, WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a \u677e\u9690\u9547\u4ead\u67ab\u516c\u8def1915\u53f7"));
+  profile2.SetInfo(NAME_LAST, WideToUTF16(L"aguantó"));
+  profile2.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
+  profiles.push_back(profile2);
+
+  AutofillProfile profile3;
+  profile3.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"sue@example.com"));
+  profile3.SetInfo(COMPANY_NAME, WideToUTF16(L"Company X"));
+  profiles.push_back(profile3);
+
+  AutofillProfile profile4;
+  profile4.SetInfo(NAME_FIRST, WideToUTF16(L"Joe 3254"));
+  profile4.SetInfo(NAME_LAST, WideToUTF16(L"\u8bb0\u8d262\u5e74\u591a"));
+  profile4.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"\uff08\u90ae\u7f16\uff1a201504\uff09"));
+  profile4.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"télévision@example.com"));
+  profile4.SetInfo(COMPANY_NAME, WideToUTF16(L"\u0907\u0932\u0947\u0915\u093f\u091f\u094d\u0930\u0928\u093f\u0915\u094d\u0938, \u0905\u092a\u094b\u0932\u094b \u091f\u093e\u092f\u0930\u094d\u0938 \u0906\u0926\u093f"));
+  profiles.push_back(profile4);
+
+  AutofillProfile profile5;
+  profile5.SetInfo(NAME_FIRST, WideToUTF16(L"Larry"));
+  profile5.SetInfo(NAME_LAST, WideToUTF16(L"\u0938\u094d\u091f\u093e\u0902\u092a \u0921\u094d\u092f\u0942\u091f\u0940"));
+  profile5.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"111111111111110000GOOGLE"));
+  profile5.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"page@000000.com"));
+  profile5.SetInfo(COMPANY_NAME, WideToUTF16(L"Google"));
+  profiles.push_back(profile5);
+
+  AutofillProfile profile6;
+  profile6.SetInfo(NAME_FIRST, WideToUTF16(L"\u4e0a\u6d77\u5e02\u91d1\u5c71\u533a \u677e\u9690\u9547\u4ead\u67ab\u516c\u8def1915\u53f7"));
+  profile6.SetInfo(NAME_LAST, WideToUTF16(L"\u0646\u062c\u0627\u0645\u064a\u0646\u0627 \u062f\u0639\u0645\u0647\u0627 \u0644\u0644\u0631\u0626\u064a\u0633 \u0627\u0644\u0633\u0648\u062f\u0627\u0646\u064a \u0639\u0645\u0631 \u0627\u0644\u0628\u0634\u064a\u0631"));
+  profile6.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"HOME 94043"));
+  profiles.push_back(profile6);
+
+  AutofillProfile profile7;
+  profile7.SetInfo(NAME_FIRST, WideToUTF16(L"&$%$$$ TESTO *&*&^&^& MOKO"));
+  profile7.SetInfo(NAME_MIDDLE, WideToUTF16(L"WOHOOOO$$$$$$$$****"));
+  profile7.SetInfo(EMAIL_ADDRESS, WideToUTF16(L"yuvu@example.com"));
+  profile7.SetInfo(ADDRESS_HOME_LINE1, WideToUTF16(L"34544, anderson ST.(120230)"));
+  profile7.SetInfo(ADDRESS_HOME_CITY, WideToUTF16(L"Sunnyvale"));
+  profile7.SetInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
+  profile7.SetInfo(ADDRESS_HOME_ZIP, WideToUTF16(L"94086"));
+  profile7.SetInfo(PHONE_HOME_WHOLE_NUMBER, WideToUTF16(L"15466784565"));
+  profile7.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"));
+  profiles.push_back(profile7);
+
+  SetProfiles(&profiles);
+  ASSERT_EQ(profiles.size(), personal_data_manager()->profiles().size());
+  for (size_t i = 0; i < profiles.size(); ++i)
+    ASSERT_EQ(profiles[i], *personal_data_manager()->profiles()[i]);
+
+  std::vector<CreditCard> cards;
+  CreditCard card1;
+  card1.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"\u751f\u6d3b\u5f88\u6709\u89c4\u5f8b \u4ee5\u73a9\u4e3a\u4e3b"));
+  card1.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"6011111111111117"));
+  card1.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"12"));
+  card1.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2011"));
+  cards.push_back(card1);
+
+  CreditCard card2;
+  card2.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"John Williams"));
+  card2.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"WokoAwesome12345"));
+  card2.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
+  card2.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
+  cards.push_back(card2);
+
+  CreditCard card3;
+  card3.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"\u0623\u062d\u0645\u062f\u064a \u0646\u062c\u0627\u062f \u0644\u0645\u062d\u0627\u0648\u0644\u0647 \u0627\u063a\u062a\u064a\u0627\u0644 \u0641\u064a \u0645\u062f\u064a\u0646\u0629 \u0647\u0645\u062f\u0627\u0646 "));
+  card3.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"\u092a\u0941\u0928\u0930\u094d\u091c\u0940\u0935\u093f\u0924 \u0939\u094b\u0917\u093e \u0928\u093e\u0932\u0902\u0926\u093e"));
+  card3.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"10"));
+  card3.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2015"));
+  cards.push_back(card3);
+
+  CreditCard card4;
+  card4.SetInfo(CREDIT_CARD_NAME, WideToUTF16(L"\u039d\u03ad\u03b5\u03c2 \u03c3\u03c5\u03b3\u03c7\u03c9\u03bd\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03ba\u03b1\u03c4\u03b1\u03c1\u03b3\u03ae\u03c3\u03b5\u03b9\u03c2"));
+  card4.SetInfo(CREDIT_CARD_NUMBER, WideToUTF16(L"00000000000000000000000"));
+  card4.SetInfo(CREDIT_CARD_EXP_MONTH, WideToUTF16(L"01"));
+  card4.SetInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR, WideToUTF16(L"2016"));
+  cards.push_back(card4);
+
+  SetCards(&cards);
+  ASSERT_EQ(cards.size(), personal_data_manager()->credit_cards().size());
+  for (size_t i = 0; i < cards.size(); ++i)
+    ASSERT_EQ(cards[i], *personal_data_manager()->credit_cards()[i]);
+}
+
+// Test filling in invalid values for profiles are saved as-is. Phone
+// information entered into the prefs UI is not validated or rejected except for
+// duplicates.
+IN_PROC_BROWSER_TEST_F(AutofillTest, Invalid) {
+  // First try profiles with invalid ZIP input.
+  AutofillProfile without_invalid;
+  without_invalid.SetInfo(NAME_FIRST, ASCIIToUTF16("Will"));
+  without_invalid.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("Sunnyvale"));
+  without_invalid.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
+  without_invalid.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("my_zip"));
+  without_invalid.SetInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("United States"));
+
+  AutofillProfile with_invalid = without_invalid;
+  with_invalid.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("Invalid_Phone_Number"));
+  SetProfile(with_invalid);
+
+  ASSERT_EQ(1, personal_data_manager()->profiles().size());
+  AutofillProfile profile = *personal_data_manager()->profiles()[0];
+  ASSERT_NE(without_invalid.GetInfo(PHONE_HOME_WHOLE_NUMBER),
+            profile.GetInfo(PHONE_HOME_WHOLE_NUMBER));
+}
+
+// Test invalid credit card numbers typed in prefs should be saved as-is.
+IN_PROC_BROWSER_TEST_F(AutofillTest, PrefsStringSavedAsIs) {
+  CreditCard card;
+  card.SetInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("Not_0123-5Checked"));
+  SetCard(card);
+
+  ASSERT_EQ(1, personal_data_manager()->credit_cards().size());
+  ASSERT_EQ(card, *personal_data_manager()->credit_cards()[0]);
+}
+
+// Test credit card info with an invalid number is not aggregated.
+// When filling out a form with an invalid credit card number (one that does not
+// pass the Luhn test) the credit card info should not be saved into Autofill
+// preferences.
+IN_PROC_BROWSER_TEST_F(AutofillTest, InvalidCreditCardNumberIsNotAggregated) {
+  ASSERT_TRUE(test_server()->Start());
+  std::string card("4408 0412 3456 7890");
+  ASSERT_FALSE(CreditCard::IsValidCreditCardNumber(ASCIIToUTF16(card)));
+  SubmitCreditCard("Bob Smith", card.c_str(), "12", "2014");
+  ASSERT_EQ(0u,
+            chrome::GetActiveTabContents(browser())->infobar_tab_helper()->
+                infobar_count());
+}
+
+// Test whitespaces and separator chars are stripped for valid CC numbers.
+// The credit card numbers used in this test pass the Luhn test. For reference:
+// http://www.merriampark.com/anatomycc.htm
+IN_PROC_BROWSER_TEST_F(AutofillTest,
+                       WhitespacesAndSeparatorCharsStrippedForValidCCNums) {
+  ASSERT_TRUE(test_server()->Start());
+  SubmitCreditCard("Bob Smith", "4408 0412 3456 7893", "12", "2014");
+  SubmitCreditCard("Jane Doe", "4417-1234-5678-9113", "10", "2013");
+
+  ASSERT_EQ(2, personal_data_manager()->credit_cards().size());
+  string16 cc1 = personal_data_manager()->credit_cards()[0]->GetInfo(
+      CREDIT_CARD_NUMBER);
+  ASSERT_TRUE(CreditCard::IsValidCreditCardNumber(cc1));
+  string16 cc2 = personal_data_manager()->credit_cards()[1]->GetInfo(
+      CREDIT_CARD_NUMBER);
+  ASSERT_TRUE(CreditCard::IsValidCreditCardNumber(cc2));
+}
+
+// Test that Autofill aggregates a minimum valid profile.
+// The minimum required address fields must be specified: First Name, Last Name,
+// Address Line 1, City, Zip Code, and State.
+IN_PROC_BROWSER_TEST_F(AutofillTest, AggregatesMinValidProfile) {
+  ASSERT_TRUE(test_server()->Start());
+  FormData data;
+  data["NAME_FIRST"] = "Bob";
+  data["NAME_LAST"] = "Smith";
+  data["ADDRESS_HOME_LINE1"] = "1234 H St.";
+  data["ADDRESS_HOME_CITY"] = "Mountain View";
+  data["ADDRESS_HOME_STATE"] = "CA";
+  data["ADDRESS_HOME_ZIP"] = "94043";
+  FillFormAndSubmit("duplicate_profiles_test.html", data);
+
+  ASSERT_EQ(1, personal_data_manager()->profiles().size());
+}
+
+// Test Autofill does not aggregate profiles with no address info.
+// The minimum required address fields must be specified: First Name, Last Name,
+// Address Line 1, City, Zip Code, and State.
+IN_PROC_BROWSER_TEST_F(AutofillTest, ProfilesNotAggregatedWithNoAddress) {
+  ASSERT_TRUE(test_server()->Start());
+  FormData data;
+  data["NAME_FIRST"] = "Bob";
+  data["NAME_LAST"] = "Smith";
+  data["EMAIL_ADDRESS"] = "bsmith@example.com";
+  data["COMPANY_NAME"] = "Mountain View";
+  data["ADDRESS_HOME_CITY"] = "Mountain View";
+  data["PHONE_HOME_WHOLE_NUMBER"] = "650-555-4567";
+  FillFormAndSubmit("duplicate_profiles_test.html", data);
+
+  ASSERT_TRUE(personal_data_manager()->profiles().empty());
+}
+
+// Test Autofill does not aggregate profiles with an invalid email.
+IN_PROC_BROWSER_TEST_F(AutofillTest, ProfilesNotAggregatedWithInvalidEmail) {
+  ASSERT_TRUE(test_server()->Start());
+  FormData data;
+  data["NAME_FIRST"] = "Bob";
+  data["NAME_LAST"] = "Smith";
+  data["EMAIL_ADDRESS"] = "garbage";
+  data["ADDRESS_HOME_LINE1"] = "1234 H St.";
+  data["ADDRESS_HOME_CITY"] = "San Jose";
+  data["ADDRESS_HOME_STATE"] = "CA";
+  data["ADDRESS_HOME_ZIP"] = "95110";
+  data["COMPANY_NAME"] = "Company X";
+  data["PHONE_HOME_WHOLE_NUMBER"] = "408-871-4567";
+  FillFormAndSubmit("duplicate_profiles_test.html", data);
+
+  ASSERT_TRUE(personal_data_manager()->profiles().empty());
+}
+
+// Test phone fields parse correctly from a given profile.
+// The high level key presses execute the following: Select the first text
+// field, invoke the autofill popup list, select the first profile within the
+// list, and commit to the profile to populate the form.
+IN_PROC_BROWSER_TEST_F(AutofillTest, ComparePhoneNumbers) {
+  ASSERT_TRUE(test_server()->Start());
+
+  AutofillProfile profile;
+  profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
+  profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
+  profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1234 H St."));
+  profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
+  profile.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
+  profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
+  profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("1-408-555-4567"));
+  SetProfile(profile);
+
+  GURL url =
+      test_server()->GetURL(std::string("files/autofill/form_phones.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+  PopulateForm("NAME_FIRST");
+
+  FormData expected;
+  expected["NAME_FIRST"] = "Bob";
+  expected["NAME_LAST"] = "Smith";
+  expected["ADDRESS_HOME_LINE1"] = "1234 H St.";
+  expected["ADDRESS_HOME_CITY"] = "San Jose";
+  expected["ADDRESS_HOME_STATE"] = "CA";
+  expected["ADDRESS_HOME_ZIP"] = "95110";
+  expected["PHONE_HOME_WHOLE_NUMBER"] = "14085554567";
+  expected["PHONE_HOME_CITY_CODE-1"] = "408";
+  expected["PHONE_HOME_CITY_CODE-2"] = "408";
+  expected["PHONE_HOME_NUMBER"] = "5554567";
+  expected["PHONE_HOME_NUMBER_3-1"] = "555";
+  expected["PHONE_HOME_NUMBER_3-2"] = "555";
+  expected["PHONE_HOME_NUMBER_4-1"] = "4567";
+  expected["PHONE_HOME_NUMBER_4-2"] = "4567";
+  expected["PHONE_HOME_EXT-1"] = "";
+  expected["PHONE_HOME_EXT-2"] = "Bob";
+  expected["PHONE_HOME_COUNTRY_CODE-1"] = "1";
+
+  for (FormData::const_iterator i = expected.begin(); i != expected.end();
+       ++i) {
+    std::string js = "window.domAutomationController.send("
+                     "document.getElementById('";
+    js += i->first + "').value)";
+    std::string value;
+    ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+        render_view_host(), L"", ASCIIToWide(js), &value));
+    ASSERT_EQ(i->second, value);
+  }
+}
+
+// Test profile is saved if phone number is valid in selected country.
+// The data file contains two profiles with valid phone numbers and two
+// profiles with invalid phone numbers from their respective country.
+IN_PROC_BROWSER_TEST_F(AutofillTest, ProfileSavedWithValidCountryPhone) {
+  ASSERT_TRUE(test_server()->Start());
+  std::vector<FormData> profiles;
+
+  FormData data1;
+  data1["NAME_FIRST"] = "Bob";
+  data1["NAME_LAST"] = "Smith";
+  data1["ADDRESS_HOME_LINE1"] = "123 Cherry Ave";
+  data1["ADDRESS_HOME_CITY"] = "Mountain View";
+  data1["ADDRESS_HOME_STATE"] = "CA";
+  data1["ADDRESS_HOME_ZIP"] = "94043";
+  data1["ADDRESS_HOME_COUNTRY"] = "United States";
+  data1["PHONE_HOME_WHOLE_NUMBER"] = "408-871-4567";
+  profiles.push_back(data1);
+
+  FormData data2;
+  data2["NAME_FIRST"] = "John";
+  data2["NAME_LAST"] = "Doe";
+  data2["ADDRESS_HOME_LINE1"] = "987 H St";
+  data2["ADDRESS_HOME_CITY"] = "San Jose";
+  data2["ADDRESS_HOME_STATE"] = "CA";
+  data2["ADDRESS_HOME_ZIP"] = "95510";
+  data2["ADDRESS_HOME_COUNTRY"] = "United States";
+  data2["PHONE_HOME_WHOLE_NUMBER"] = "408-123-456";
+  profiles.push_back(data2);
+
+  FormData data3;
+  data3["NAME_FIRST"] = "Jane";
+  data3["NAME_LAST"] = "Doe";
+  data3["ADDRESS_HOME_LINE1"] = "1523 Garcia St";
+  data3["ADDRESS_HOME_CITY"] = "Mountain View";
+  data3["ADDRESS_HOME_STATE"] = "CA";
+  data3["ADDRESS_HOME_ZIP"] = "94043";
+  data3["ADDRESS_HOME_COUNTRY"] = "Germany";
+  data3["PHONE_HOME_WHOLE_NUMBER"] = "+49 40-80-81-79-000";
+  profiles.push_back(data3);
+
+  FormData data4;
+  data4["NAME_FIRST"] = "Bonnie";
+  data4["NAME_LAST"] = "Smith";
+  data4["ADDRESS_HOME_LINE1"] = "6723 Roadway Rd";
+  data4["ADDRESS_HOME_CITY"] = "San Jose";
+  data4["ADDRESS_HOME_STATE"] = "CA";
+  data4["ADDRESS_HOME_ZIP"] = "95510";
+  data4["ADDRESS_HOME_COUNTRY"] = "Germany";
+  data4["PHONE_HOME_WHOLE_NUMBER"] = "+21 08450 777 777";
+  profiles.push_back(data4);
+
+  for (size_t i = 0; i < profiles.size(); ++i)
+    FillFormAndSubmit("autofill_test_form.html", profiles[i]);
+
+  ASSERT_EQ(2, personal_data_manager()->profiles().size());
+}
+
+// Test Autofill appends country codes to aggregated phone numbers.
+// The country code is added for the following case:
+//   The phone number contains the correct national number size and
+//   is a valid format.
+IN_PROC_BROWSER_TEST_F(AutofillTest, AppendCountryCodeForAggregatedPhones) {
+  ASSERT_TRUE(test_server()->Start());
+  FormData data;
+  data["NAME_FIRST"] = "Bob";
+  data["NAME_LAST"] = "Smith";
+  data["ADDRESS_HOME_LINE1"] = "1234 H St.";
+  data["ADDRESS_HOME_CITY"] = "San Jose";
+  data["ADDRESS_HOME_STATE"] = "CA";
+  data["ADDRESS_HOME_ZIP"] = "95110";
+  data["ADDRESS_HOME_COUNTRY"] = "Germany";
+  data["PHONE_HOME_WHOLE_NUMBER"] = "(08) 450 777-777";
+  FillFormAndSubmit("autofill_test_form.html", data);
+
+  ASSERT_EQ(1, personal_data_manager()->profiles().size());
+  string16 phone =
+      personal_data_manager()->profiles()[0]->GetInfo(PHONE_HOME_WHOLE_NUMBER);
+  ASSERT_TRUE(StartsWith(phone, ASCIIToUTF16("+49"), true));
+}
+
+// Test CC info not offered to be saved when autocomplete=off for CC field.
+// If the credit card number field has autocomplete turned off, then the credit
+// card infobar should not offer to save the credit card info. The credit card
+// number must be a valid Luhn number.
+IN_PROC_BROWSER_TEST_F(AutofillTest, CCInfoNotStoredWhenAutocompleteOff) {
+  ASSERT_TRUE(test_server()->Start());
+  FormData data;
+  data["CREDIT_CARD_NAME"] = "Bob Smith";
+  data["CREDIT_CARD_NUMBER"] = "4408041234567893";
+  data["CREDIT_CARD_EXP_MONTH"] = "12";
+  data["CREDIT_CARD_EXP_4_DIGIT_YEAR"] = "2014";
+  FillFormAndSubmit("cc_autocomplete_off_test.html", data);
+
+  ASSERT_EQ(0u,
+            chrome::GetActiveTabContents(browser())->infobar_tab_helper()->
+                infobar_count());
+}
+
+// Test that Autofill does not fill in read-only fields.
+IN_PROC_BROWSER_TEST_F(AutofillTest, NoAutofillForReadOnlyFields) {
+  ASSERT_TRUE(test_server()->Start());
+
+  std::string email("bsmith@gmail.com");
+  std::string addr_line1("1234 H St.");
+
+  AutofillProfile profile;
+  profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
+  profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
+  profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16(email));
+  profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16(addr_line1));
+  profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
+  profile.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
+  profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
+  profile.SetInfo(COMPANY_NAME, ASCIIToUTF16("Company X"));
+  profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("408-871-4567"));
+  SetProfile(profile);
+
+  GURL url = test_server()->GetURL(std::string(
+      "files/autofill/read_only_field_test.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+  PopulateForm("firstname");
+
+  std::string readonly_field_value;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+      L"window.domAutomationController.send("
+      L"document.getElementById('email').value);", &readonly_field_value));
+  ASSERT_NE(email, readonly_field_value);
+
+  std::string addr1_field_value;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+      L"window.domAutomationController.send("
+      L"document.getElementById('address').value);", &addr1_field_value));
+  ASSERT_EQ(addr_line1, addr1_field_value);
+}
+
+// Test form is fillable from a profile after form was reset.
+// Steps:
+//   1. Fill form using a saved profile.
+//   2. Reset the form.
+//   3. Fill form using a saved profile.
+IN_PROC_BROWSER_TEST_F(AutofillTest, FormFillableOnReset) {
+  ASSERT_TRUE(test_server()->Start());
+
+  AutofillProfile profile;
+  profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
+  profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
+  profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("bsmith@gmail.com"));
+  profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1234 H St."));
+  profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
+  profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
+  SetProfile(profile);
+
+  GURL url = test_server()->GetURL(std::string(
+      "files/autofill/autofill_test_form.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+  PopulateForm("NAME_FIRST");
+
+  ASSERT_TRUE(content::ExecuteJavaScript(
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+      L"document.getElementById('testform').reset()"));
+
+  PopulateForm("NAME_FIRST");
+
+  bool result;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+      L"window.domAutomationController.send("
+      L"document.getElementById('NAME_FIRST').value == 'Bob' &&"
+      L"document.getElementById('NAME_LAST').value == 'Smith' &&"
+      L"document.getElementById('EMAIL_ADDRESS').value == 'bsmith@gmail.com' &&"
+      L"document.getElementById('ADDRESS_HOME_LINE1').value == '1234 H St.' &&"
+      L"document.getElementById('ADDRESS_HOME_CITY').value == 'San Jose' &&"
+      L"document.getElementById('PHONE_HOME_WHOLE_NUMBER').value == '4088714567')",
+      &result));
+  ASSERT_TRUE(result);
+}
+
+// Test Autofill distinguishes a middle initial in a name.
+IN_PROC_BROWSER_TEST_F(AutofillTest, DistinguishMiddleInitialWithinName) {
+  ASSERT_TRUE(test_server()->Start());
+
+  AutofillProfile profile;
+  profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
+  profile.SetInfo(NAME_MIDDLE, ASCIIToUTF16("Leo"));
+  profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
+  profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("bsmith@gmail.com"));
+  profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1234 H St."));
+  profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
+  profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
+  SetProfile(profile);
+
+  GURL url = test_server()->GetURL(std::string(
+      "files/autofill/autofill_middleinit_form.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+  PopulateForm("NAME_FIRST");
+
+  std::string middleinit_field_value;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+      L"window.domAutomationController.send("
+      L"document.getElementById('NAME_MIDDLE').value)",
+      &middleinit_field_value));
+  ASSERT_EQ("L", middleinit_field_value);
+}
+
+// Test forms with multiple email addresses are filled properly.
+// Entire form should be filled with one user gesture.
+IN_PROC_BROWSER_TEST_F(AutofillTest, MultipleEmailFilledByOneUserGesture) {
+  ASSERT_TRUE(test_server()->Start());
+
+  std::string email("bsmith@gmail.com");
+
+  AutofillProfile profile;
+  profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
+  profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
+  profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16(email));
+  profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
+  SetProfile(profile);
+
+  GURL url = test_server()->GetURL(std::string(
+      "files/autofill/autofill_confirmemail_form.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+  PopulateForm("NAME_FIRST");
+
+  std::string js_return_confirmemail_field;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
+      L"window.domAutomationController.send("
+      L"document.getElementById('EMAIL_CONFIRM').value)",
+      &js_return_confirmemail_field));
+  ASSERT_EQ(email, js_return_confirmemail_field);
+}
+
+// Test profile not aggregated if email found in non-email field.
+IN_PROC_BROWSER_TEST_F(AutofillTest, ProfileWithEmailInOtherFieldNotSaved) {
+  ASSERT_TRUE(test_server()->Start());
+
+  FormData data;
+  data["NAME_FIRST"] = "Bob";
+  data["NAME_LAST"] = "Smith";
+  data["ADDRESS_HOME_LINE1"] = "bsmith@gmail.com";
+  data["ADDRESS_HOME_CITY"] = "San Jose";
+  data["ADDRESS_HOME_STATE"] = "CA";
+  data["ADDRESS_HOME_ZIP"] = "95110";
+  data["COMPANY_NAME"] = "Company X";
+  data["PHONE_HOME_WHOLE_NUMBER"] = "408-871-4567";
+  FillFormAndSubmit("duplicate_profiles_test.html", data);
+
+  ASSERT_EQ(0, personal_data_manager()->profiles().size());
+}
+
+// Test latency time on form submit with lots of stored Autofill profiles.
+// This test verifies when a profile is selected from the Autofill dictionary
+// that consists of thousands of profiles, the form does not hang after being
+// submitted.
+IN_PROC_BROWSER_TEST_F(AutofillTest, FormFillLatencyAfterSubmit) {
+  ASSERT_TRUE(test_server()->Start());
+
+  std::vector<std::string> cities;
+  cities.push_back("San Jose");
+  cities.push_back("San Francisco");
+  cities.push_back("Sacramento");
+  cities.push_back("Los Angeles");
+
+  std::vector<std::string> streets;
+  streets.push_back("St");
+  streets.push_back("Ave");
+  streets.push_back("Ln");
+  streets.push_back("Ct");
+
+  const int kNumProfiles = 1500;
+  base::Time start_time = base::Time::Now();
+  std::vector<AutofillProfile> profiles;
+  for (size_t i = 0; i < kNumProfiles; i++) {
+    AutofillProfile profile;
+    string16 name(base::IntToString16(i));
+    string16 email(name + ASCIIToUTF16("@example.com"));
+    string16 street = ASCIIToUTF16(
+        base::IntToString(base::RandInt(0, 10000)) + " " +
+        streets[base::RandInt(0, streets.size() - 1)]);
+    string16 city = ASCIIToUTF16(cities[base::RandInt(0, cities.size() - 1)]);
+    string16 zip(base::IntToString16(base::RandInt(0, 10000)));
+    profile.SetInfo(NAME_FIRST, name);
+    profile.SetInfo(EMAIL_ADDRESS, email);
+    profile.SetInfo(ADDRESS_HOME_LINE1, street);
+    profile.SetInfo(ADDRESS_HOME_CITY, city);
+    profile.SetInfo(ADDRESS_HOME_STATE, WideToUTF16(L"CA"));
+    profile.SetInfo(ADDRESS_HOME_ZIP, zip);
+    profile.SetInfo(ADDRESS_HOME_COUNTRY, WideToUTF16(L"United States"));
+    profiles.push_back(profile);
+  }
+  SetProfiles(&profiles);
+  LOG(INFO) << "Created " << kNumProfiles << " profiles in " <<
+               (base::Time::Now() - start_time).InSeconds() << " seconds.";
+
+  GURL url = test_server()->GetURL(std::string(
+      "files/autofill/latency_after_submit_test.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+  PopulateForm("NAME_FIRST");
+
+  content::WindowedNotificationObserver load_stop_observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::Source<content::NavigationController>(
+          &chrome::GetActiveWebContents(browser())->GetController()));
+
+  ASSERT_TRUE(content::ExecuteJavaScript(
+      render_view_host(), L"",
+      ASCIIToWide("document.getElementById('testform').submit();")));
+  load_stop_observer.Wait();
+}
+
+// Test that profiles merge for aggregated data with same address.
+// The criterion for when two profiles are expected to be merged is when their
+// 'Address Line 1' and 'City' data match. When two profiles are merged, any
+// remaining address fields are expected to be overwritten. Any non-address
+// fields should accumulate multi-valued data.
+IN_PROC_BROWSER_TEST_F(AutofillTest, MergeAggregatedProfilesWithSameAddress) {
+  AggregateProfilesIntoAutofillPrefs("dataset_2.txt");
+
+  ASSERT_EQ(3, personal_data_manager()->profiles().size());
+}
+
+// Test profiles are not merged without mininum address values.
+// Mininum address values needed during aggregation are: address line 1, city,
+// state, and zip code.
+// Profiles are merged when data for address line 1 and city match.
+IN_PROC_BROWSER_TEST_F(AutofillTest, ProfilesNotMergedWhenNoMinAddressData) {
+  AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
+
+  ASSERT_EQ(0, personal_data_manager()->profiles().size());
+}
+
+// Test Autofill ability to merge duplicate profiles and throw away junk.
+IN_PROC_BROWSER_TEST_F(AutofillTest, MergeAggregatedDuplicatedProfiles) {
+  int num_of_profiles =
+      AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
+
+  ASSERT_GT(num_of_profiles,
+            static_cast<int>(personal_data_manager()->profiles().size()));
+}