Refactor Autofill for out of process iframes (OOPIF).

chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

Index: chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc
index 42de6cd73c2ecff183df03579f6ee5fad7371abf..22c15c439a17a1faf3fa9aae9054c778267fb278 100644
--- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc
+++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc
@@ -44,6 +44,7 @@ PasswordGenerationPopupControllerImpl::GetOrCreate(
     const PasswordForm& form,
     int max_length,
     password_manager::PasswordManager* password_manager,
+    password_manager::PasswordManagerDriver* driver,
     PasswordGenerationPopupObserver* observer,
     content::WebContents* web_contents,
     gfx::NativeView container_view) {
@@ -59,13 +60,8 @@ PasswordGenerationPopupControllerImpl::GetOrCreate(
 
   PasswordGenerationPopupControllerImpl* controller =
       new PasswordGenerationPopupControllerImpl(
-          bounds,
-          form,
-          max_length,
-          password_manager,
-          observer,
-          web_contents,
-          container_view);
+          bounds, form, max_length, password_manager, driver, observer,
+          web_contents, container_view);
   return controller->GetWeakPtr();
 }
 
@@ -74,12 +70,14 @@ PasswordGenerationPopupControllerImpl::PasswordGenerationPopupControllerImpl(
     const PasswordForm& form,
     int max_length,
     password_manager::PasswordManager* password_manager,
+    password_manager::PasswordManagerDriver* driver,
     PasswordGenerationPopupObserver* observer,
     content::WebContents* web_contents,
     gfx::NativeView container_view)
     : view_(NULL),
       form_(form),
       password_manager_(password_manager),
+      driver_(driver),
       observer_(observer),
       generator_(new PasswordGenerator(max_length)),
       controller_common_(bounds, container_view, web_contents),
@@ -155,7 +153,7 @@ void PasswordGenerationPopupControllerImpl::PasswordAccepted() {
       new AutofillMsg_GeneratedPasswordAccepted(
           web_contents()->GetRenderViewHost()->GetRoutingID(),
           current_password_));
-  password_manager_->SetFormHasGeneratedPassword(form_);
+  password_manager_->SetFormHasGeneratedPassword(driver_, form_);
   Hide();
 }