[Password Generation] Update UI to match final mocks.

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 "base/time/time.h"
 #include "components/autofill/content/common/autofill_param_traits_macros.h"
@@ skipping 223 matching lines @@
 
 // Instructs the browser to show the password generation popup at the
 // specified location. This location should be specified in the renderers
 // coordinate system. Form is the form associated with the password field.
 IPC_MESSAGE_ROUTED3(AutofillHostMsg_ShowPasswordGenerationPopup,
                     gfx::RectF /* source location */,
                     int /* max length of the password */,
                     autofill::PasswordForm)
 
 // Instructs the browser to show the popup for editing a generated password.
-// The location should be specified in the renderers coordinate system.
-IPC_MESSAGE_ROUTED1(AutofillHostMsg_ShowPasswordEditingPopup,
-                    gfx::RectF /* source location */)
+// 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 the following suggestions from the
 // password manager.
 IPC_MESSAGE_ROUTED4(AutofillHostMsg_ShowPasswordSuggestions,
                     autofill::FormFieldData /* the form field */,
                     gfx::RectF /* input field bounds, window-relative */,
                     std::vector<base::string16> /* suggestions */,
                     std::vector<base::string16> /* realms */)
 
 // 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 */)