Prepare the infrastructure for password overrides.

components/autofill/content/common/autofill_messages.h

 // Copyright 2013 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.
 
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/autofill/content/common/autofill_param_traits_macros.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/form_field_data_predictions.h"
 #include "components/autofill/core/common/password_form.h"
+#include "components/autofill/core/common/password_form_field_prediction_map.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/autofill/core/common/web_element_descriptor.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/common_param_traits_macros.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 #include "url/gurl.h"
 
 #define IPC_MESSAGE_START AutofillMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(autofill::FormFieldData::RoleAttribute,
                           autofill::FormFieldData::ROLE_ATTRIBUTE_OTHER)
 
+IPC_ENUM_TRAITS_MAX_VALUE(
+    autofill::PasswordFormFieldPredictionType,
+    autofill::PasswordFormFieldPredictionType::PREDICTION_MAX)
+
 IPC_ENUM_TRAITS_MAX_VALUE(base::i18n::TextDirection,
                           base::i18n::TEXT_DIRECTION_NUM_DIRECTIONS - 1)
 
 IPC_STRUCT_TRAITS_BEGIN(autofill::WebElementDescriptor)
   IPC_STRUCT_TRAITS_MEMBER(descriptor)
   IPC_STRUCT_TRAITS_MEMBER(retrieval_method)
 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS_MAX_VALUE(autofill::WebElementDescriptor::RetrievalMethod,
                           autofill::WebElementDescriptor::NONE)
@@ skipping 57 matching lines @@
 IPC_ENUM_TRAITS_MAX_VALUE(
     blink::WebFormElement::AutocompleteResult,
     blink::WebFormElement::AutocompleteResultErrorInvalid)
 
 // Singly-included section for type definitions.
 #ifndef COMPONENTS_AUTOFILL_CONTENT_COMMON_AUTOFILL_MESSAGES_H_
 #define COMPONENTS_AUTOFILL_CONTENT_COMMON_AUTOFILL_MESSAGES_H_
 
 // IPC_MESSAGE macros fail on the std::map, when expanding. We need to define
 // a type to avoid that.
-using FormDataFieldDataMap =
-    std::map<autofill::FormData, autofill::FormFieldData>;
+using FormsPredictionsMap =
+    std::map<autofill::FormData, autofill::PasswordFormFieldPredictionMap>;
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_COMMON_AUTOFILL_MESSAGES_H_
 
 // Autofill messages sent from the browser to the renderer.
 
 // Tells the render frame that a user gesture was observed somewhere in the tab
 // (including in a different frame).
 IPC_MESSAGE_ROUTED0(AutofillMsg_FirstUserGestureObservedInTab)
 
 // Instructs the renderer to immediately return an IPC acknowledging the ping.
@@ skipping 77 matching lines @@
                     blink::WebFormElement::AutocompleteResult /* result */,
                     base::string16 /* message */,
                     autofill::FormData /* form_data */)
 
 // Sent when Autofill manager gets the query response from the Autofill server
 // and there are fields classified as ACCOUNT_CREATION_PASSWORD in the response.
 IPC_MESSAGE_ROUTED1(AutofillMsg_AccountCreationFormsDetected,
                     std::vector<autofill::FormData> /* forms */)
 
 // Sent when Autofill manager gets the query response from the Autofill server
-// which contains information about username fields for some forms.
+// which contains information about username and password fields for some forms.
 // |predictions| maps forms to their username fields.
-IPC_MESSAGE_ROUTED1(AutofillMsg_AutofillUsernameDataReceived,
-                    FormDataFieldDataMap /* predictions */)
+IPC_MESSAGE_ROUTED1(AutofillMsg_AutofillUsernameAndPasswordDataReceived,
+                    FormsPredictionsMap /* predictions */)
 
 // Autofill messages sent from the renderer to the browser.
 
 // TODO(creis): check in the browser that the renderer actually has permission
 // for the URL to avoid compromised renderers talking to the browser.
 
 // Notification that there has been a user gesture.
 IPC_MESSAGE_ROUTED0(AutofillHostMsg_FirstUserGestureObserved)
 
 // Notification that forms have been seen that are candidates for
@@ skipping 107 matching lines @@
     int /* key */,
     base::i18n::TextDirection /* text_direction */,
     base::string16 /* username typed by user */,
     int /* options bitmask of autofill::ShowPasswordSuggestionsOptions */,
     gfx::RectF /* input field bounds, window-relative */)
 
 // Inform browser of data list values for the curent field.
 IPC_MESSAGE_ROUTED2(AutofillHostMsg_SetDataList,
                     std::vector<base::string16> /* values */,
                     std::vector<base::string16> /* labels */)