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

components/autofill/content/renderer/password_autofill_agent.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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 80 matching lines @@
   struct PasswordInfo {
     blink::WebInputElement password_field;
     PasswordFormFillData fill_data;
     bool backspace_pressed_last;
     // The user manually edited the password more recently than the username was
     // changed.
     bool password_was_edited_last;
     PasswordInfo();
   };
   typedef std::map<blink::WebElement, PasswordInfo> LoginToPasswordInfoMap;
+  typedef std::map<blink::WebElement, int> LoginToPasswordInfoKeyMap;
   typedef std::map<blink::WebElement, blink::WebElement> PasswordToLoginMap;
   typedef std::map<blink::WebFrame*,
                    linked_ptr<PasswordForm> > FrameToPasswordFormMap;
 
   // This class keeps track of autofilled password input elements and makes sure
   // the autofilled password value is not accessible to JavaScript code until
   // the user interacts with the page.
   class PasswordValueGatekeeper {
    public:
     PasswordValueGatekeeper();
@@ skipping 28 matching lines @@
   void DidFinishLoad(blink::WebLocalFrame* frame) override;
   void DidStopLoading() override;
   void FrameDetached(blink::WebFrame* frame) override;
   void FrameWillClose(blink::WebFrame* frame) override;
   void WillSendSubmitEvent(blink::WebLocalFrame* frame,
                            const blink::WebFormElement& form) override;
   void WillSubmitForm(blink::WebLocalFrame* frame,
                       const blink::WebFormElement& form) override;
 
   // RenderView IPC handlers:
-  void OnFillPasswordForm(const PasswordFormFillData& form_data);
+  void OnFillPasswordForm(int key, const PasswordFormFillData& form_data);
   void OnSetLoggingState(bool active);
 
   // Scans the given frame for password forms and sends them up to the browser.
   // If |only_visible| is true, only forms visible in the layout are sent.
   void SendPasswordForms(blink::WebFrame* frame, bool only_visible);
 
   bool ShowSuggestionPopup(const PasswordFormFillData& fill_data,
                            const blink::WebInputElement& user_input,
                            bool show_all);
 
@@ skipping 24 matching lines @@
       const blink::WebFrame* current_frame);
 
   // Extracts a PasswordForm from |form| and saves it as
   // |provisionally_saved_forms_[frame]|, as long as it satisfies |restriction|.
   void ProvisionallySavePassword(blink::WebLocalFrame* frame,
                                  const blink::WebFormElement& form,
                                  ProvisionallySaveRestriction restriction);
 
   // The logins we have filled so far with their associated info.
   LoginToPasswordInfoMap login_to_password_info_;
+  // And the keys under which PasswordAutofillManager can find the same info.
+  LoginToPasswordInfoKeyMap login_to_password_info_key_;
   // A (sort-of) reverse map to |login_to_password_info_|.
   PasswordToLoginMap password_to_username_;
 
   // Used for UMA stats.
   OtherPossibleUsernamesUsage usernames_usage_;
 
   // Pointer to the WebView. Used to access page scale factor.
   blink::WebView* web_view_;
 
   // Set if the user might be submitting a password form on the current page,
@@ skipping 18 matching lines @@
   bool did_stop_loading_;
 
   base::WeakPtrFactory<PasswordAutofillAgent> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordAutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_