Prepare the infrastructure for password overrides.

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>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/autofill/core/common/form_data_predictions.h"
+#include "components/autofill/core/common/password_form_field_prediction_map.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 
 namespace blink {
 class WebInputElement;
 class WebKeyboardEvent;
 class WebSecurityOrigin;
 }
@@ skipping 75 matching lines @@
     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::WebInputElement, PasswordInfo> LoginToPasswordInfoMap;
   typedef std::map<blink::WebElement, int> LoginToPasswordInfoKeyMap;
   typedef std::map<blink::WebInputElement, blink::WebInputElement>
       PasswordToLoginMap;
-  using FormDataFieldDataMap =
-      std::map<autofill::FormData, autofill::FormFieldData>;
+  using FormsPredictionsMap =
+      std::map<autofill::FormData, autofill::PasswordFormFieldPredictionMap>;
 
   // 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();
     ~PasswordValueGatekeeper();
 
     // Call this for every autofilled password field, so that the gatekeeper
@@ skipping 51 matching lines @@
   void WillSubmitForm(const blink::WebFormElement& form) override;
 
   // Legacy RenderViewObserver:
   void DidStartLoading();
   void DidStopLoading();
   void LegacyDidStartProvisionalLoad(blink::WebLocalFrame* frame);
 
   // RenderView IPC handlers:
   void OnFillPasswordForm(int key, const PasswordFormFillData& form_data);
   void OnSetLoggingState(bool active);
-  void OnAutofillUsernameDataReceived(const FormDataFieldDataMap& predictions);
+  void OnAutofillUsernameAndPasswordDataReceived(
+      const FormsPredictionsMap& predictions);
 
   // 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(bool only_visible);
 
   // Instructs the browser to show a pop-up suggesting which credentials could
   // be filled. |show_in_password_field| should indicate whether the pop-up is
   // to be shown on the password field instead of on the username field. If the
   // username exists, it should be passed as |user_input|. If there is no
   // username, pass the password field in |user_input|. In the latter case, no
@@ skipping 81 matching lines @@
   // before preview.
   int username_selection_start_;
 
   // True indicates that all frames in a page have been rendered.
   bool did_stop_loading_;
 
   // True indicates that there is a command line flag to enable showing of
   // save password prompt on in-page navigations.
   bool save_password_on_in_page_navigation_;
 
-  // Contains server predictions for which field is the username field for forms
-  // on the page.
-  FormDataFieldDataMap form_predictions_;
+  // Contains server predictions for username, password and/or new password
+  // fields for individual forms.
+  FormsPredictionsMap form_predictions_;
 
   base::WeakPtrFactory<PasswordAutofillAgent> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordAutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_PASSWORD_AUTOFILL_AGENT_H_