Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/ui/autofill/autofill_popup_controller_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/autofill/test_popup_controller_common.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.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_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/test_autofill_client.h"
 #include "components/autofill/core/browser/test_autofill_external_delegate.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/components_scaled_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/text_utils.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ skipping 90 matching lines @@
 class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
  public:
   AutofillPopupControllerUnitTest()
       : autofill_client_(new MockAutofillClient()),
         autofill_popup_controller_(NULL) {}
   ~AutofillPopupControllerUnitTest() override {}
 
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
-    ContentAutofillDriver::CreateForWebContentsAndDelegate(
-        web_contents(),
-        autofill_client_.get(),
-        "en-US",
+    ContentAutofillDriverFactory::CreateForWebContentsAndDelegate(
+        web_contents(), autofill_client_.get(), "en-US",
         AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
+    ContentAutofillDriverFactory* factory =
+        ContentAutofillDriverFactory::FromWebContents(web_contents());
     ContentAutofillDriver* driver =
-        ContentAutofillDriver::FromWebContents(web_contents());
+        factory->DriverForFrame(web_contents()->GetMainFrame());
     external_delegate_.reset(
         new NiceMock<MockAutofillExternalDelegate>(
             driver->autofill_manager(),
             driver));
 
     autofill_popup_controller_ =
         new testing::NiceMock<TestAutofillPopupController>(
             external_delegate_->GetWeakPtr(),gfx::Rect());
   }
 
@@ skipping 269 matching lines @@
   EXPECT_EQ(ids, autofill_popup_controller_->identifiers());
 
   // Clear datalist values and check that the popup becomes hidden.
   EXPECT_CALL(*autofill_popup_controller_, Hide());
   data_list_values.clear();
   autofill_popup_controller_->UpdateDataListValues(data_list_values,
                                                    data_list_values);
 }
 
 TEST_F(AutofillPopupControllerUnitTest, GetOrCreate) {
+  ContentAutofillDriverFactory* factory =
+      ContentAutofillDriverFactory::FromWebContents(web_contents());
   ContentAutofillDriver* driver =
-      ContentAutofillDriver::FromWebContents(web_contents());
+      factory->DriverForFrame(web_contents()->GetMainFrame());
   MockAutofillExternalDelegate delegate(driver->autofill_manager(), driver);
 
   WeakPtr<AutofillPopupControllerImpl> controller =
       AutofillPopupControllerImpl::GetOrCreate(
           WeakPtr<AutofillPopupControllerImpl>(), delegate.GetWeakPtr(),
           NULL, NULL, gfx::Rect(), base::i18n::UNKNOWN_DIRECTION);
   EXPECT_TRUE(controller.get());
 
   controller->Hide();
 
@@ skipping 86 matching lines @@
   EXPECT_NE(names[0], autofill_popup_controller_->names()[0]);
   EXPECT_NE(subtexts[0], autofill_popup_controller_->subtexts()[0]);
 
   // The second element was shorter so it should be unchanged.
   EXPECT_EQ(names[1], autofill_popup_controller_->names()[1]);
   EXPECT_EQ(subtexts[1], autofill_popup_controller_->subtexts()[1]);
 }
 #endif
 
 }  // namespace autofill