Refactor Autofill for out of process iframes (OOPIF).

components/password_manager/content/browser/content_credential_manager_dispatcher.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 "components/password_manager/content/browser/content_credential_manager_dispatcher.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/common/password_form.h"
+#include "components/password_manager/content/browser/content_password_manager_driver.h"
+#include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "components/password_manager/content/browser/credential_manager_password_form_manager.h"
 #include "components/password_manager/content/common/credential_manager_messages.h"
 #include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace password_manager {
@@ skipping 39 matching lines @@
     int request_id,
     const password_manager::CredentialInfo& credential) {
   DCHECK(request_id);
   scoped_ptr<autofill::PasswordForm> form(
       CreatePasswordFormFromCredentialInfo(credential,
           web_contents()->GetLastCommittedURL().GetOrigin()));
 
   // TODO(mkwst): This is a stub; we should be checking the PasswordStore to
   // determine whether or not the credential exists, and calling UpdateLogin
   // accordingly.
-  form_manager_.reset(
-      new CredentialManagerPasswordFormManager(client_, *form, this));
+  // TODO(estade): should pass the proper PasswordManagerDriver.

[vabr (Chromium), 2014/11/17 15:08:49]

Do you still need this TODO(estade)? Looks like the code now says exactly what
it should -- get the driver for the main frame.

[Evan Stade, 2014/11/17 20:34:39]

correct, removed

+  form_manager_.reset(new CredentialManagerPasswordFormManager(
+      client_,
+      ContentPasswordManagerDriverFactory::FromWebContents(web_contents())
+          ->GetDriverForFrame(web_contents()->GetMainFrame()),
+      *form, this));
 
   web_contents()->GetRenderViewHost()->Send(
       new CredentialManagerMsg_AcknowledgeSignedIn(
           web_contents()->GetRenderViewHost()->GetRoutingID(), request_id));
 }
 
 void ContentCredentialManagerDispatcher::OnProvisionalSaveComplete() {
   DCHECK(form_manager_);
   client_->PromptUserToSavePassword(form_manager_.Pass());
 }
@@ skipping 54 matching lines @@
           pending_request_id_,
           info));
   pending_request_id_ = 0;
 }
 
 PasswordStore* ContentCredentialManagerDispatcher::GetPasswordStore() {
   return client_ ? client_->GetPasswordStore() : nullptr;
 }
 
 }  // namespace password_manager