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

chrome/browser/autofill/autofill_browsertest.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/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/api/infobars/infobar_tab_service.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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
 #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"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 using content::RenderViewHost;
@@ skipping 25 matching lines @@
     "<label for=\"country\">Country:</label>"
     " <select id=\"country\">"
     " <option value=\"\" selected=\"yes\">--</option>"
     " <option value=\"CA\">Canada</option>"
     " <option value=\"US\">United States</option>"
     " </select><br>"
     "<label for=\"phone\">Phone number:</label>"
     " <input type=\"text\" id=\"phone\"><br>"
     "</form>";
 
-class WindowedPersonalDataManagerObserver : public PersonalDataManagerObserver {
+class WindowedPersonalDataManagerObserver
+    : public PersonalDataManagerObserver,
+      public content::NotificationObserver {
  public:
-  WindowedPersonalDataManagerObserver() :
-      personal_data_changed_(false),
-      has_run_message_loop_(false) {
+  explicit WindowedPersonalDataManagerObserver(Browser* browser) :
+      alerted_(false),
+      has_run_message_loop_(false),
+      browser_(browser),
+      infobar_service_(NULL) {
+    PersonalDataManagerFactory::GetForProfile(browser_->profile())->
+        SetObserver(this);
+    registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
+                   content::NotificationService::AllSources());

[Ilya Sherman, 2012/08/21 03:04:28]

This doesn't really seem to fit with the rest of the class.  Can you move it out
to a separate WindowedNotificationObserver?

[jam, 2012/08/21 06:20:06]

I had kept it like because there didn't seem to be a good reason of having yet
another PDMObserver. If another one was created, it would have to duplicate the
existing class. The (deleted) automation C++ code had one class for this stuff
btw. As such, I don't think there's a compelling reason to split it up.

+  }
+
+  ~WindowedPersonalDataManagerObserver() {
+    if (!infobar_service_)
+      return;
+
+    InfoBarDelegate* infobar = NULL;
+    if (infobar_service_->GetInfoBarCount() > 0 &&
+        (infobar = infobar_service_->GetInfoBarDelegateAt(0))) {
+      infobar_service_->RemoveInfoBar(infobar);
+    }
   }
 
   void Wait() {
-    if (!personal_data_changed_) {
+    if (!alerted_) {
       has_run_message_loop_ = true;
       content::RunMessageLoop();
     }
+    PersonalDataManagerFactory::GetForProfile(browser_->profile())->
+        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 {

[Ilya Sherman, 2012/08/21 03:04:28]

nit: Please add ASSERTs to verify that the type/source of the notification are
the ones you expect.

[jam, 2012/08/21 06:20:06]

I think this is unnecessary at this point.. if someone adds another
notification, they will have to change this code. until then, an assert is just
verifying that the notification system works, which should be tested in one test
instead of in all

+    // Accept in the infobar.
+    infobar_service_ =
+        InfoBarTabService::ForTab(chrome::GetActiveTabContents(browser_));
+    InfoBarDelegate* infobar = infobar_service_->GetInfoBarDelegateAt(0);
+
+    ConfirmInfoBarDelegate* confirm_infobar =
+        infobar->AsConfirmInfoBarDelegate();
+    confirm_infobar->Accept();
   }
 
  private:
-  bool personal_data_changed_;
+  bool alerted_;
   bool has_run_message_loop_;
+  Browser* browser_;
+  content::NotificationRegistrar registrar_;
+  InfoBarTabService* infobar_service_;
 };
 
 class AutofillTest : public InProcessBrowserTest {
  protected:
   AutofillTest() {}
 
+  PersonalDataManager* personal_data_manager() {
+    return PersonalDataManagerFactory::GetForProfile(browser()->profile());
+  }
+
   void CreateTestProfile() {
     autofill_test::DisableSystemServices(browser()->profile());
 
     AutofillProfile profile;
     autofill_test::SetProfileInfo(
         &profile, "Milton", "C.", "Waddams",
         "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->SetObserver(&observer);
-
-    personal_data_manager->AddProfile(profile);
+    WindowedPersonalDataManagerObserver observer(browser());
+    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(browser());
+    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(browser());
+    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;

[Ilya Sherman, 2012/08/21 03:04:28]

FormData is already a type defined in webkit/forms/form_data.h, and is used
somewhat often in Autofill code, so this should be renamed.  Also, why are you
using a base::hash_map rather than an std::map?

[jam, 2012/08/21 06:20:06]

renamed to FormMap
no reason in particular. switched to map

+  void FillFormAndSubmit(const std::string filename, const FormData& data) {

[Ilya Sherman, 2012/08/21 03:04:28]

nit: Pass the filename by reference

[Ilya Sherman, 2012/08/21 03:04:28]

nit: Please add a comment describing this method -- in particular that it blocks
on a change to the PersonalDataManager

[jam, 2012/08/21 06:20:06]

Done.

[jam, 2012/08/21 06:20:06]

Done.

+    GURL url = test_server()->GetURL(std::string("files/autofill/") + filename);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: No need to explicitly construct a C++ string from "files/autofill"; the
addition operator will take care of that implicitly.

[jam, 2012/08/21 06:20:06]

Done.

+    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(browser());
+    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();";

[Ilya Sherman, 2012/08/21 03:04:28]

nit: Move the rest of this string definition up one line?  (Looks like it will
fit.)

[jam, 2012/08/21 06:20:06]

Done.

+    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());

[Ilya Sherman, 2012/08/21 03:04:28]

If the CHECK fails, the whole test suite will crash, right?  Is that desirable?

[jam, 2012/08/21 06:20:06]

yep & yep. if the test sever can't be started, then there's no point running the
rest of the test. I would normally add ASSERT(), which does the same thing, but
that can't be used in functions that have return values since it does an early
return

+
+    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);
+      if (fields.empty())
+        continue;  // Blank line.
+      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;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
         L"window.domAutomationController.send("
         L"document.getElementById('" + field_name + L"').value);", &value));
     EXPECT_EQ(expected_value, value);
@@ skipping 562 matching lines @@
   // Once click the text field, it starts again.
   ASSERT_TRUE(content::ExecuteJavaScript(
       render_view_host(), L"",
       L"cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   translation_observer.Wait();
 
   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(1u, personal_data_manager()->profiles().size());
+  ASSERT_EQ(profile, *personal_data_manager()->profiles()[0]);
+
+  ASSERT_EQ(1u, personal_data_manager()->credit_cards().size());
+  ASSERT_EQ(credit_card, *personal_data_manager()->credit_cards()[0]);
+}

[Ilya Sherman, 2012/08/21 03:04:28]

I think this test is redundant with tests in
chrome/browser/autofill/personal_data_manager_unittest.cc

[jam, 2012/08/21 06:20:06]

I have ported all the tests and tried to do a straight translation so it would
be less contentious (i.e. I did not go through the history of every test to see
if it was written as a regression test, or for other reasons). I don't know
enough about autofill to know if it's redundant with other unittests, or if
there's value in testing this in a browser test as opposed to a unit test.

if you feel strongly that we should remove this test, I'm ok with that.

[Ilya Sherman, 2012/08/21 07:24:17]

This test is redundant with the unit test
PersonalDataManagerTest.AddProfilesAndCreditCards, and hence should be removed.

[jam, 2012/08/21 14:49:11]

Done.

+
+// 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(1u, personal_data_manager()->profiles().size());
+  ASSERT_EQ(profile, *personal_data_manager()->profiles()[0]);
+}

[Ilya Sherman, 2012/08/21 03:04:28]

Ditto.

[jam, 2012/08/21 14:49:11]

Done.

+
+// 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]);
+}

[Ilya Sherman, 2012/08/21 03:04:28]

If this test is not redundant with existing PersonalDataManagerTest.* tests, it
should probably be moved into that test suite.  It doesn't look like this needs
to be a browser test.

[jam, 2012/08/21 06:20:06]

I don't know all the tests there. if you find one that this is redundant with,
let me know and I can delete it.
Again, I don't know if there's value in testing this through an actual browser
or not. Since I don't know which tests are redundant, or unnecessary as a
browser test, I had opted for a straight translation.

[Ilya Sherman, 2012/08/21 07:24:17]

This test does not need to be a browser_test; it can be a regular unit test.  If
you don't want to move it over as part of this CL, please add a TODO(isherman):
to move this over to be a unit test under PersonalDataManagerTest.

[jam, 2012/08/21 14:49:11]

Done.

+
+// 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(1u, 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));
+}

[Ilya Sherman, 2012/08/21 03:04:28]

I think this test is redundant with tests in
chrome/browser/autofill/personal_data_manager_unittest.cc

[jam, 2012/08/21 06:20:06]

ditto

[Ilya Sherman, 2012/08/21 07:24:17]

This test is meant to be a test of the WebUI at chrome://settings/autofill. 
Admittedly, that is not actually what the PyAuto code was doing.  If you don't
want to convert this over to being a WebUI test right now, please file a bug for
converting it.

[jam, 2012/08/21 14:49:11]

Done.

+
+// Test invalid credit card numbers typed in prefs should be saved as-is.

[Ilya Sherman, 2012/08/21 03:04:28]

This test is meant to be testing the settings page at
chrome://chrome/settings/autofill.  In fact, maybe all of the above tests that I
mentioned are probably already unit tested are actually supposed to be testing
the webui settings.  Right now, the test is skipping all the WebUI JavaScript
and handlers, which rather defeats the point.

[jam, 2012/08/21 06:20:06]

I think there is webui js harness already that is meant to test settings page,
so it seems tests can use that.

Again, I was aiming for a straight translation. If you think this is redundant
with other existing tests, then I'm happy to remove it.

[Ilya Sherman, 2012/08/21 07:24:17]

Ditto with the above: This test is meant to be a test of the WebUI at
chrome://settings/autofill.  Admittedly, that is not actually what the PyAuto
code was doing.  If you don't want to convert this over to being a WebUI test
right now, please file a bug for converting it.

[jam, 2012/08/21 14:49:11]

Done.

+IN_PROC_BROWSER_TEST_F(AutofillTest, PrefsStringSavedAsIs) {
+  CreditCard card;
+  card.SetInfo(CREDIT_CARD_NUMBER, ASCIIToUTF16("Not_0123-5Checked"));
+  SetCard(card);
+
+  ASSERT_EQ(1u, 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,
+            InfoBarTabService::ForTab(chrome::GetActiveTabContents(browser()))->
+                GetInfoBarCount());
+}
+
+// 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(2u, 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(1u, 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);

[Ilya Sherman, 2012/08/21 03:04:28]

Optional nit: Perhaps re-use CreateTestProfile(), and add a country code to that
profile?

[jam, 2012/08/21 06:20:06]

I didn't want to change the previous autofill tests..

+
+  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"] = "";
+  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);

[Ilya Sherman, 2012/08/21 03:04:28]

Can you use ExpectFieldValue() for the body of this loop?  (In fact, you could
probably omit the map entirely, since you could just have each line above be a
call to ExpectFieldValue())

[jam, 2012/08/21 06:20:06]

Thanks, I didn't see that function before. also fixed below

+  }
+}
+
+// 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(2u, personal_data_manager()->profiles().size());

[Ilya Sherman, 2012/08/21 03:04:28]

Please add checks to verify that the correct profiles are getting saved.

[jam, 2012/08/21 06:20:06]

Done.

+}
+
+// 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(1u, 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,
+            InfoBarTabService::ForTab(chrome::GetActiveTabContents(browser()))->
+                GetInfoBarCount());
+}
+
+// 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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: ExpectFieldValue(), and compare to the field's original value?  (We
shouldn't partially overwrite or clear a read-only field.)

[jam, 2012/08/21 06:20:06]

this is ASSERT_NE

[Ilya Sherman, 2012/08/21 07:24:17]

Please add a TODO(isherman): to fix this to be an ASSERT_EQ if you don't want to
change this right now.

[jam, 2012/08/21 14:49:11]

ah I think I didn't understand you originally. now checking that it's empty.

+
+  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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: ExpectFieldValue()?

[jam, 2012/08/21 06:20:06]

Done.

+}
+
+// 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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: CreateTestProfile()?

[jam, 2012/08/21 06:20:06]

Done.

+
+  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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: CreateTestProfile()?

[jam, 2012/08/21 06:20:06]

Done.

+
+  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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: ExpectFieldValue()?

[jam, 2012/08/21 06:20:06]

Done.

+}
+
+// Test forms with multiple email addresses are filled properly.
+// Entire form should be filled with one user gesture.

[Ilya Sherman, 2012/08/21 03:04:28]

This description makes me think that we should be checking the values of all of
the fields in the form, not just one of the fields.

[jam, 2012/08/21 06:20:06]

please feel free to improve the tests in followup change. my goal was to
translate them so we can remove the automation hooks.

[Ilya Sherman, 2012/08/21 07:24:17]

Please add a TODO(isherman): to verify the entire form's contents.

[jam, 2012/08/21 14:49:11]

Done.

+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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: CreateTestProfile()?

+
+  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);

[Ilya Sherman, 2012/08/21 03:04:28]

nit: ExpectFieldValue()?

[jam, 2012/08/21 06:20:06]

Done.

+}
+
+// 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(0u, 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 (int 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.";

[Ilya Sherman, 2012/08/21 03:04:28]

nit: Passing tests should be silent.  Is this log line important to the test, or
can it be removed?

[jam, 2012/08/21 06:20:06]

I think one line is ok, at least in the beginning so that we know how long this
step takes on the slower bots (i.e. if it causes flakiness because it takes too
long).

[Ilya Sherman, 2012/08/21 07:24:17]

Ok.  In that case, please add a TODO or file a bug to remove this once we've
gathered the info from the bots.

[jam, 2012/08/21 14:49:11]

Done.

+
+  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();

[Ilya Sherman, 2012/08/21 03:04:28]

I'd expect to see some EXPECT or ASSERT here verifying that the form submission
is reasonably fast, since that's what the test description says it's testing. 
Are you just expecting that the regular test timeout will cover this?  If so,
please add a comment indicating that.

[jam, 2012/08/21 06:20:06]

right. the comment said a browser hang. so this will detect it.

+}
+
+// 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(3u, 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(0u, 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()));

[Ilya Sherman, 2012/08/21 03:04:28]

This looks like it's only testing that we throw away or merge at least one
profile, which is a weaker test than the above ones.  Is this test just
redundant with those?  If so, let's get rid of it.

[jam, 2012/08/21 06:20:06]

again, I don't know enough about autofill to know if I should throw this out or
not. if you think we can delete this, it's fine with me.

[Ilya Sherman, 2012/08/21 07:24:17]

Please add a TODO(isherman): to investigate removing this test, as it is likely
redundant.

[jam, 2012/08/21 14:49:11]

Done.

+}