Prepare the infrastructure for password overrides.

components/password_manager/content/browser/content_password_manager_driver.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_password_manager_driver.h"
 
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
@@ skipping 52 matching lines @@
 }
 
 void ContentPasswordManagerDriver::AccountCreationFormsFound(
     const std::vector<autofill::FormData>& forms) {
   content::RenderFrameHost* host = render_frame_host_;
   host->Send(new AutofillMsg_AccountCreationFormsDetected(host->GetRoutingID(),
                                                           forms));
 }
 
 void ContentPasswordManagerDriver::AutofillDataReceived(
-    const std::map<autofill::FormData, autofill::FormFieldData>& predictions) {
+    const std::map<autofill::FormData,
+                   autofill::PasswordFormFieldPredictionMap>& predictions) {
   content::RenderFrameHost* host = render_frame_host_;
-  host->Send(new AutofillMsg_AutofillUsernameDataReceived(host->GetRoutingID(),
-                                                          predictions));
+  host->Send(new AutofillMsg_AutofillUsernameAndPasswordDataReceived(
+      host->GetRoutingID(),
+      predictions));
 }
 
 void ContentPasswordManagerDriver::GeneratedPasswordAccepted(
     const base::string16& password) {
   content::RenderFrameHost* host = render_frame_host_;
   host->Send(new AutofillMsg_GeneratedPasswordAccepted(host->GetRoutingID(),
                                                        password));
 }
 
 void ContentPasswordManagerDriver::FillSuggestion(
@@ skipping 85 matching lines @@
   GetPasswordManager()->OnInPageNavigation(this, password_form);
 }
 
 void ContentPasswordManagerDriver::OnPasswordNoLongerGenerated(
     const autofill::PasswordForm& password_form) {
   GetPasswordManager()->SetHasGeneratedPasswordForForm(this, password_form,
                                                        false);
 }
 
 }  // namespace password_manager