Fix list focus after tab key in chrome://settings/autofillEditAddress page.

chrome/browser/autofill/autofill_interactive_uitest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/autofill/autofill_uitest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_manager_test_delegate.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
-#include "components/autofill/core/browser/personal_data_manager.h"
-#include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "components/autofill/core/browser/validation.h"
-#include "components/infobars/core/confirm_infobar_delegate.h"
-#include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "components/translate/core/browser/translate_infobar_delegate.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/render_widget_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 "content/public/test/test_utils.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 static const char kDataURIPrefix[] = "data:text/html;charset=utf-8,";
@@ skipping 60 matching lines @@
   void Wait() {
     loop_runner_->Run();
   }
 
  private:
   scoped_refptr<content::MessageLoopRunner> loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManagerTestDelegateImpl);
 };
 
-
-// WindowedPersonalDataManagerObserver ----------------------------------------
-
-class WindowedPersonalDataManagerObserver
-    : public PersonalDataManagerObserver,
-      public infobars::InfoBarManager::Observer {
- public:
-  explicit WindowedPersonalDataManagerObserver(Browser* browser)
-      : alerted_(false),
-        has_run_message_loop_(false),
-        browser_(browser),
-        infobar_service_(InfoBarService::FromWebContents(
-            browser_->tab_strip_model()->GetActiveWebContents())) {
-    PersonalDataManagerFactory::GetForProfile(browser_->profile())->
-        AddObserver(this);
-    infobar_service_->AddObserver(this);
-  }
-
-  ~WindowedPersonalDataManagerObserver() override {
-    while (infobar_service_->infobar_count() > 0) {
-      infobar_service_->RemoveInfoBar(infobar_service_->infobar_at(0));
-    }
-    infobar_service_->RemoveObserver(this);
-  }
-
-  // PersonalDataManagerObserver:
-  void OnPersonalDataChanged() override {
-    if (has_run_message_loop_) {
-      base::MessageLoopForUI::current()->Quit();
-      has_run_message_loop_ = false;
-    }
-    alerted_ = true;
-  }
-
-  void OnInsufficientFormData() override { OnPersonalDataChanged(); }
-
-
-  void Wait() {
-    if (!alerted_) {
-      has_run_message_loop_ = true;
-      content::RunMessageLoop();
-    }
-    PersonalDataManagerFactory::GetForProfile(browser_->profile())->
-        RemoveObserver(this);
-  }
-
- private:
-  // infobars::InfoBarManager::Observer:
-  void OnInfoBarAdded(infobars::InfoBar* infobar) override {
-    infobar_service_->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate()->
-        Accept();
-  }
-
-  bool alerted_;
-  bool has_run_message_loop_;
-  Browser* browser_;
-  InfoBarService* infobar_service_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowedPersonalDataManagerObserver);
-};
-
 // AutofillInteractiveTest ----------------------------------------------------
 
 class AutofillInteractiveTest : public InProcessBrowserTest {
  protected:
   AutofillInteractiveTest() :
       key_press_event_sink_(
           base::Bind(&AutofillInteractiveTest::HandleKeyPressEvent,
                      base::Unretained(this))) {}
   ~AutofillInteractiveTest() override {}
 
@@ skipping 21 matching lines @@
   void TearDownOnMainThread() override {
     // Make sure to close any showing popups prior to tearing down the UI.
     content::WebContents* web_contents = GetWebContents();
     AutofillManager* autofill_manager =
         ContentAutofillDriverFactory::FromWebContents(web_contents)
             ->DriverForFrame(web_contents->GetMainFrame())
             ->autofill_manager();
     autofill_manager->client()->HideAutofillPopup();
   }
 
-  PersonalDataManager* GetPersonalDataManager() {
-    return PersonalDataManagerFactory::GetForProfile(browser()->profile());
-  }
-
   content::WebContents* GetWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   content::RenderViewHost* GetRenderViewHost() {
     return GetWebContents()->GetRenderViewHost();
   }
 
-  void CreateTestProfile() {
-    AutofillProfile profile;
-    test::SetProfileInfo(
-        &profile, "Milton", "C.", "Waddams",
-        "red.swingline@initech.com", "Initech", "4120 Freidrich Lane",
-        "Basement", "Austin", "Texas", "78744", "US", "5125551234");
-
-    WindowedPersonalDataManagerObserver observer(browser());
-    GetPersonalDataManager()->AddProfile(profile);
-
-    // AddProfile is asynchronous. Wait for it to finish before continuing the
-    // tests.
-    observer.Wait();
-  }
-
   void SetProfiles(std::vector<AutofillProfile>* profiles) {
     WindowedPersonalDataManagerObserver observer(browser());
-    GetPersonalDataManager()->SetProfiles(profiles);
+    GetPersonalDataManager(browser())->SetProfiles(profiles);
     observer.Wait();
   }
 
   void SetProfile(const AutofillProfile& profile) {
     std::vector<AutofillProfile> profiles;
     profiles.push_back(profile);
     SetProfiles(&profiles);
   }
 
   // Populates a webpage form using autofill data and keypress events.
@@ skipping 216 matching lines @@
   // key press event callback handles the event (at least on Mac), a DCHECK
   // ends up going off that the |event| doesn't have an |os_event| associated
   // with it.
   content::RenderWidgetHost::KeyPressEventCallback key_press_event_sink_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillInteractiveTest);
 };
 
 // Test that basic form fill is working.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, BasicFormFill) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling can be initiated by pressing the down arrow.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillViaDownArrow) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
   FocusFirstNameField();
 
   // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
   SendKeyToPageAndWait(ui::VKEY_DOWN);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
 
   // Press Enter to accept the autofill suggestions.
   SendKeyToPopupAndWait(ui::VKEY_RETURN);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillSelectViaTab) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
   FocusFirstNameField();
 
   // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
   SendKeyToPageAndWait(ui::VKEY_DOWN);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
 
   // Press tab to accept the autofill suggestions.
   SendKeyToPopupAndWait(ui::VKEY_TAB);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillViaClick) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
       browser(), GURL(std::string(kDataURIPrefix) + kTestFormString)));
   // Focus a fillable field.
   ASSERT_NO_FATAL_FAILURE(FocusFirstNameField());
 
   // Now click it.
   test_delegate()->Reset();
   ASSERT_NO_FATAL_FAILURE(ClickFirstNameField());
   test_delegate()->Wait();
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
 
   // Press Enter to accept the autofill suggestions.
   SendKeyToPopupAndWait(ui::VKEY_RETURN);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 // Makes sure that the first click does *not* activate the popup.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, DontAutofillForFirstClick) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
       browser(), GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Click the first name field while it's out of focus, then twiddle our thumbs
   // a bit. If a popup were to show, it would hit the asserts in
   // AutofillManagerTestDelegateImpl while we're wasting time.
   ASSERT_NO_FATAL_FAILURE(ClickFirstNameField());
   ASSERT_NO_FATAL_FAILURE(MakeSurePopupDoesntAppear());
 
   // The second click should activate the popup since the first click focused
   // the field.
   test_delegate()->Reset();
   ASSERT_NO_FATAL_FAILURE(ClickFirstNameField());
   test_delegate()->Wait();
 }
 
 // Makes sure that clicking outside the focused field doesn't activate
 // the popup.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, DontAutofillForOutsideClick) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
       browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString +
            "<button disabled id='disabled-button'>Cant click this</button>")));
 
   ASSERT_NO_FATAL_FAILURE(FocusFirstNameField());
 
   // Clicking a disabled button will generate a mouse event but focus doesn't
   // change. This tests that autofill can handle a mouse event outside a focused
   // input *without* showing the popup.
   ASSERT_NO_FATAL_FAILURE(ClickElementWithId("disabled-button"));
   ASSERT_NO_FATAL_FAILURE(MakeSurePopupDoesntAppear());
 
   test_delegate()->Reset();
   ASSERT_NO_FATAL_FAILURE(ClickFirstNameField());
   test_delegate()->Wait();
 }
 
 // Test that a field is still autofillable after the previously autofilled
 // value is deleted.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, OnDeleteValueAfterAutofill) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke and accept the Autofill popup and verify the form was filled.
   FocusFirstNameField();
   SendKeyToPageAndWait(ui::VKEY_M);
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
   SendKeyToPopupAndWait(ui::VKEY_RETURN);
@@ skipping 44 matching lines @@
   SendKeyToDataListPopup(ui::VKEY_DOWN);
   SendKeyToDataListPopup(ui::VKEY_RETURN);
   ExpectFieldValue("firstname", "Adam");
   std::string color;
   GetFieldBackgroundColor("firstname", &color);
   EXPECT_EQ(color, orginalcolor);
 }
 
 // Test that a JavaScript oninput event is fired after auto-filling a form.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, OnInputAfterAutofill) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   const char kOnInputScript[] =
       "<script>"
       "focused_fired = false;"
       "unfocused_fired = false;"
       "changed_select_fired = false;"
       "unchanged_select_fired = false;"
       "document.getElementById('firstname').oninput = function() {"
       "  focused_fired = true;"
       "};"
@@ skipping 51 matching lines @@
       "domAutomationController.send(unchanged_select_fired);",
       &unchanged_select_fired));
   EXPECT_TRUE(focused_fired);
   EXPECT_TRUE(unfocused_fired);
   EXPECT_TRUE(changed_select_fired);
   EXPECT_FALSE(unchanged_select_fired);
 }
 
 // Test that a JavaScript onchange event is fired after auto-filling a form.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, OnChangeAfterAutofill) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   const char kOnChangeScript[] =
       "<script>"
       "focused_fired = false;"
       "unfocused_fired = false;"
       "changed_select_fired = false;"
       "unchanged_select_fired = false;"
       "document.getElementById('firstname').onchange = function() {"
       "  focused_fired = true;"
       "};"
@@ skipping 50 matching lines @@
       GetRenderViewHost(),
       "domAutomationController.send(unchanged_select_fired);",
       &unchanged_select_fired));
   EXPECT_TRUE(focused_fired);
   EXPECT_TRUE(unfocused_fired);
   EXPECT_TRUE(changed_select_fired);
   EXPECT_FALSE(unchanged_select_fired);
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, InputFiresBeforeChange) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   const char kInputFiresBeforeChangeScript[] =
       "<script>"
       "inputElementEvents = [];"
       "function recordInputElementEvent(e) {"
       "  if (e.target.tagName != 'INPUT') throw 'only <input> tags allowed';"
       "  inputElementEvents.push(e.type);"
       "}"
       "selectElementEvents = [];"
       "function recordSelectElementEvent(e) {"
@@ skipping 59 matching lines @@
       "domAutomationController.send(selectElementEvents[1]);",
       &select_element_events[1]));
 
   EXPECT_EQ("input", select_element_events[0]);
   EXPECT_EQ("change", select_element_events[1]);
 }
 
 // Test that we can autofill forms distinguished only by their |id| attribute.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        AutofillFormsDistinguishedById) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   const std::string kURL =
       std::string(kDataURIPrefix) + kTestFormString +
       "<script>"
       "var mainForm = document.forms[0];"
       "mainForm.id = 'mainForm';"
       "var newForm = document.createElement('form');"
       "newForm.action = mainForm.action;"
       "newForm.method = mainForm.method;"
       "newForm.id = 'newForm';"
       "mainForm.parentNode.insertBefore(newForm, mainForm);"
       "</script>";
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(), GURL(kURL)));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that we properly autofill forms with repeated fields.
 // In the wild, the repeated fields are typically either email fields
 // (duplicated for "confirmation"); or variants that are hot-swapped via
 // JavaScript, with only one actually visible at any given time.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillFormWithRepeatedField) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) +
            "<form action=\"http://www.example.com/\" method=\"POST\">"
            "<label for=\"firstname\">First name:</label>"
            " <input type=\"text\" id=\"firstname\""
            "        onfocus=\"domAutomationController.send(true)\"><br>"
            "<label for=\"lastname\">Last name:</label>"
            " <input type=\"text\" id=\"lastname\"><br>"
@@ skipping 25 matching lines @@
            "</form>")));
 
   // Invoke Autofill.
   TryBasicFormFill();
   ExpectFieldValue("state_freeform", std::string());
 }
 
 // Test that we properly autofill forms with non-autofillable fields.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        AutofillFormWithNonAutofillableField) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) +
            "<form action=\"http://www.example.com/\" method=\"POST\">"
            "<label for=\"firstname\">First name:</label>"
            " <input type=\"text\" id=\"firstname\""
            "        onfocus=\"domAutomationController.send(true)\"><br>"
            "<label for=\"middlename\">Middle name:</label>"
            " <input type=\"text\" id=\"middlename\" autocomplete=\"off\" /><br>"
@@ skipping 22 matching lines @@
            "<label for=\"phone\">Phone number:</label>"
            " <input type=\"text\" id=\"phone\"><br>"
            "</form>")));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that we can Autofill dynamically generated forms.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, DynamicFormFill) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) +
            "<form id=\"form\" action=\"http://www.example.com/\""
            "      method=\"POST\"></form>"
            "<script>"
            "function AddElement(name, label) {"
            "  var form = document.getElementById('form');"
            ""
@@ skipping 67 matching lines @@
 
   // Dynamically construct the form.
   ASSERT_TRUE(content::ExecuteScript(GetRenderViewHost(), "BuildForm();"));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling works after reloading the current page.
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillAfterReload) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Reload the page.
   content::WebContents* web_contents = GetWebContents();
   web_contents->GetController().Reload(false);
   content::WaitForLoadStop(web_contents);
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillAfterTranslate) {
   // TODO(port): Test corresponding bubble translate UX: http://crbug.com/383235
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   GURL url(std::string(kDataURIPrefix) +
                "<form action=\"http://www.example.com/\" method=\"POST\">"
                "<label for=\"fn\">なまえ</label>"
                " <input type=\"text\" id=\"fn\""
                "        onfocus=\"domAutomationController.send(true)\""
                "><br>"
                "<label for=\"ln\">みょうじ</label>"
                " <input type=\"text\" id=\"ln\"><br>"
                "<label for=\"a1\">Address line 1:</label>"
@@ skipping 131 matching lines @@
 
 // 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.
 // Flakily times out: http://crbug.com/270341
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, DISABLED_FormFillableOnReset) {
   ASSERT_TRUE(test_server()->Start());
 
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   GURL url = test_server()->GetURL("files/autofill/autofill_test_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   ASSERT_TRUE(content::ExecuteScript(
        GetWebContents(), "document.getElementById('testform').reset()"));
 
   PopulateForm("NAME_FIRST");
 
   ExpectFieldValue("NAME_FIRST", "Milton");
   ExpectFieldValue("NAME_LAST", "Waddams");
   ExpectFieldValue("EMAIL_ADDRESS", "red.swingline@initech.com");
   ExpectFieldValue("ADDRESS_HOME_LINE1", "4120 Freidrich Lane");
   ExpectFieldValue("ADDRESS_HOME_CITY", "Austin");
   ExpectFieldValue("ADDRESS_HOME_STATE", "Texas");
   ExpectFieldValue("ADDRESS_HOME_ZIP", "78744");
   ExpectFieldValue("ADDRESS_HOME_COUNTRY", "United States");
   ExpectFieldValue("PHONE_HOME_WHOLE_NUMBER", "5125551234");
 }
 
 // Test Autofill distinguishes a middle initial in a name.
 // Flakily times out: http://crbug.com/270341
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        DISABLED_DistinguishMiddleInitialWithinName) {
   ASSERT_TRUE(test_server()->Start());
 
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   GURL url = test_server()->GetURL(
       "files/autofill/autofill_middleinit_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   ExpectFieldValue("NAME_MIDDLE", "C");
 }
 
 // Test forms with multiple email addresses are filled properly.
@@ skipping 90 matching lines @@
       "document.getElementById('testform').submit();"));
   // This will ensure the test didn't hang.
   load_stop_observer.Wait();
 }
 
 // Test that Chrome doesn't crash when autocomplete is disabled while the user
 // is interacting with the form.  This is a regression test for
 // http://crbug.com/160476
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        DisableAutocompleteWhileFilling) {
-  CreateTestProfile();
+  CreateTestProfile(browser());
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke Autofill: Start filling the first name field with "M" and wait for
   // the popup to be shown.
   FocusFirstNameField();
   SendKeyToPageAndWait(ui::VKEY_M);
 
   // Now that the popup with suggestions is showing, disable autocomplete for
   // the active field.
   ASSERT_TRUE(content::ExecuteScript(
       GetRenderViewHost(),
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
 }
 
 }  // namespace autofill