Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/autofill/content_autofill_driver_browsertest.cc

 // Copyright 2014 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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_pref_service_syncable.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/test_autofill_client.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 27 matching lines @@
  private:
   TestingPrefServiceSyncable prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillClient);
 };
 
 // Subclass ContentAutofillDriver so we can create an ContentAutofillDriver
 // instance.
 class TestContentAutofillDriver : public ContentAutofillDriver {
  public:
-  TestContentAutofillDriver(content::WebContents* web_contents,
+  TestContentAutofillDriver(content::RenderFrameHost* rfh,
                             AutofillClient* client)
       : ContentAutofillDriver(
-            web_contents,
+            rfh,
             client,
             g_browser_process->GetApplicationLocale(),
             AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {}
   ~TestContentAutofillDriver() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestContentAutofillDriver);
 };
 
 }  // namespace
 
 class ContentAutofillDriverBrowserTest : public InProcessBrowserTest,
                                          public content::WebContentsObserver {
  public:
   ContentAutofillDriverBrowserTest() {}
   virtual ~ContentAutofillDriverBrowserTest() {}
 
   virtual void SetUpOnMainThread() override {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents != NULL);
     Observe(web_contents);
     AutofillManager::RegisterProfilePrefs(autofill_client_.GetPrefRegistry());
 
-    autofill_driver_.reset(
-        new TestContentAutofillDriver(web_contents, &autofill_client_));
-  }
-
-  // Normally the WebContents will automatically delete the driver, but here
-  // the driver is owned by this test, so we have to manually destroy.
-  virtual void WebContentsDestroyed() override {
-    autofill_driver_.reset();
+    web_contents->RemoveUserData(
+        ContentAutofillDriverFactory::
+            kContentAutofillDriverFactoryWebContentsUserDataKey);
+    ContentAutofillDriverFactory::CreateForWebContentsAndDelegate(
+        web_contents, &autofill_client_, "en-US",
+        AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
   }
 
   virtual void WasHidden() override {
     if (!web_contents_hidden_callback_.is_null())
       web_contents_hidden_callback_.Run();
   }
 
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override {
     if (!nav_entry_committed_callback_.is_null())
       nav_entry_committed_callback_.Run();
   }
 
  protected:
   content::WebContents* web_contents_;
 
   base::Closure web_contents_hidden_callback_;
   base::Closure nav_entry_committed_callback_;
 
   testing::NiceMock<MockAutofillClient> autofill_client_;
-  scoped_ptr<TestContentAutofillDriver> autofill_driver_;
 };
 
 IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest,
                        SwitchTabAndHideAutofillPopup) {
   // Notification is different on platforms. On linux this will be called twice,
   // while on windows only once.
   EXPECT_CALL(autofill_client_, HideAutofillPopup()).Times(testing::AtLeast(1));
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
@@ skipping 22 matching lines @@
   browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIAboutURL),
                                             content::Referrer(),
                                             CURRENT_TAB,
                                             ui::PAGE_TRANSITION_TYPED,
                                             false));
   runner->Run();
   nav_entry_committed_callback_.Reset();
 }
 
 }  // namespace autofill