Prepare the infrastructure for password overrides.

chrome/renderer/autofill/password_autofill_agent_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/content/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/autofill/content/renderer/test_password_autofill_agent.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
+#include "components/autofill/core/common/password_form_field_prediction_map.h"
 #include "content/public/renderer/render_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ skipping 1783 matching lines @@
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSendSubmitEvent(username_element_.form());
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSubmitForm(username_element_.form());
 
   // Observe that the PasswordAutofillAgent identifies the second field (e-mail)
   // as username.
   ExpectFormSubmittedWithUsernameAndPasswords("temp@google.com", "random", "");
 }
 
-// Tests that username predictions are followed when identifying the username
-// in a password form with two plain text fields.
-TEST_F(PasswordAutofillAgentTest, FindingUsernameWithAutofillPredictions) {
+// Tests that field predictions are followed when identifying the username
+// and password in a password form with two plain text fields.
+TEST_F(PasswordAutofillAgentTest, FindingFieldsWithAutofillPredictions) {
   LoadHTML(kFormHTMLWithTwoTextFields);
   UpdateUsernameAndPasswordElements();
   blink::WebInputElement email_element = GetInputElementByID(kEmailName);
   SimulateUsernameChange("temp");
   SimulateUserInputChangeForElement(&email_element, "temp@google.com");
   SimulatePasswordChange("random");
   // Find FormData for visible password form.
   blink::WebFormElement form_element = username_element_.form();
   FormData form_data;
   ASSERT_TRUE(WebFormElementToFormData(form_element,
                                        blink::WebFormControlElement(),
                                        EXTRACT_NONE, &form_data, nullptr));
-  // Simulate Autofill predictions: the first field is username.
-  std::map<autofill::FormData, autofill::FormFieldData> predictions;
-  predictions[form_data] = form_data.fields[0];
-  AutofillMsg_AutofillUsernameDataReceived msg(0, predictions);
+  // Simulate Autofill predictions: the first field is username, the third
+  // one is password.
+  std::map<autofill::FormData, PasswordFormFieldPredictionMap> predictions;
+  predictions[form_data][PREDICTION_USERNAME] = form_data.fields[0];
+  predictions[form_data][PREDICTION_NEW_PASSWORD] = form_data.fields[2];
+  AutofillMsg_AutofillUsernameAndPasswordDataReceived msg(0, predictions);
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->OnMessageReceived(msg);
 
-  // The prediction should still match even if the form changes, as long
-  // as the particular element doesn't change.
+  // The predictions should still match even if the form changes, as long
+  // as the particular elements don't change.
   std::string add_field_to_form =
       "var form = document.getElementById('LoginTestForm');"
       "var new_input = document.createElement('input');"
       "new_input.setAttribute('type', 'text');"
       "new_input.setAttribute('id', 'other_field');"
       "form.appendChild(new_input);";
   ExecuteJavaScript(add_field_to_form.c_str());
 
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSendSubmitEvent(username_element_.form());
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSubmitForm(username_element_.form());
 
   // Observe that the PasswordAutofillAgent identifies the first field as
   // username.
+  // TODO(msramek): We should also test that adding another password field
+  // won't override the password field prediction either. However, the password
+  // field predictions are not taken into account yet.
   ExpectFormSubmittedWithUsernameAndPasswords("temp", "random", "");
 }
 
 // The user types in a username and a password. Then JavaScript changes password
 // field to readonly state before submit. PasswordAutofillAgent can correctly
 // process readonly password field. This test models behaviour of gmail.com.
 TEST_F(PasswordAutofillAgentTest, ReadonlyPasswordFieldOnSubmit) {
   SimulateUsernameChange("temp");
   SimulatePasswordChange("random");
 
   // Simulate that JavaScript makes password field readonly.
   SetElementReadOnly(password_element_, true);
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSubmitForm(username_element_.form());
 
   // Observe that the PasswordAutofillAgent can correctly process submitted
   // form.
   ExpectFormSubmittedWithUsernameAndPasswords("temp", "random", "");
 }
 
 }  // namespace autofill