Don't use FormFieldData only as a key in a map

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"
@@ skipping 94 matching lines @@
                     int /* query_id */,
                     autofill::FormData /* form */)
 
 // Instructs the renderer to preview the active form with the given form data.
 IPC_MESSAGE_ROUTED2(AutofillMsg_PreviewForm,
                     int /* query_id */,
                     autofill::FormData /* form */)
 
 // Fill a password form and prepare field autocomplete for multiple
 // matching logins. Lets the renderer know if it should disable the popup
-// because the browser process will own the popup UI.
-IPC_MESSAGE_ROUTED1(AutofillMsg_FillPasswordForm,
+// because the browser process will own the popup UI. |key| serves for
+// identifying the fill form data in subsequent
+// AutofillHostMsg_ShowPasswordSuggestions messages to the browser.
+IPC_MESSAGE_ROUTED2(AutofillMsg_FillPasswordForm,
+                    int /* key */,
                     autofill::PasswordFormFillData /* the fill form data*/)
 
 // Notification to start (|active| == true) or stop (|active| == false) logging
 // the decisions made about saving the password.
 IPC_MESSAGE_ROUTED1(AutofillMsg_SetLoggingState, bool /* active */)
 
 // Send the heuristic and server field type predictions to the renderer.
 IPC_MESSAGE_ROUTED1(
     AutofillMsg_FieldTypePredictionsAvailable,
     std::vector<autofill::FormDataPredictions> /* forms */)
@@ skipping 146 matching lines @@
 // Instructs the browser to show the popup for editing a generated password.
 // The location should be specified in the renderers coordinate system. Form
 // is the form associated with the password field.
 IPC_MESSAGE_ROUTED2(AutofillHostMsg_ShowPasswordEditingPopup,
                     gfx::RectF /* source location */,
                     autofill::PasswordForm)
 
 // Instructs the browser to hide any password generation popups.
 IPC_MESSAGE_ROUTED0(AutofillHostMsg_HidePasswordGenerationPopup)
 
-// Instruct the browser that a password mapping has been found for a field.
-IPC_MESSAGE_ROUTED2(AutofillHostMsg_AddPasswordFormMapping,
-                    autofill::FormFieldData, /* the user name field */
-                    autofill::PasswordFormFillData /* password pairings */)
-
-// Instruct the browser to show a popup with suggestions for the form field.
-IPC_MESSAGE_ROUTED4(AutofillHostMsg_ShowPasswordSuggestions,
-                    autofill::FormFieldData /* the form field */,
+// Instruct the browser to show a popup with suggestions filled from data
+// associated with |key|. The popup will use |text_direction| for displaying
+// text.
+IPC_MESSAGE_ROUTED5(AutofillHostMsg_ShowPasswordSuggestions,
+                    int /* key */,
+                    base::i18n::TextDirection /*text_direction */,
                     base::string16 /* username typed by user */,
                     bool /* show all suggestions */,
                     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 */)