[Password Manager] Replace WebInputElement.setValue with WebInputElement.setAutofillValue

chrome/renderer/autofill/password_generation_agent_browsertest.cc

 // 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.
 
 #include <string.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 232 matching lines @@
 const char kNewPasswordAutocompleteAttributeFormHTML[] =
     "<FORM name = 'blah' action = 'http://www.random.com/'> "
     "  <INPUT type = 'text' id = 'username'/> "
     "  <INPUT type = 'password' id = 'first_password' "
     "         autocomplete='new-password' size = 5/>"
     "  <INPUT type = 'password' id = 'second_password' size = 5/> "
     "  <INPUT type = 'button' id = 'dummy'/> "
     "  <INPUT type = 'submit' value = 'LOGIN' />"
     "</FORM>";
 
-const char ChangeDetectionScript[] =
-    "<script>"
-    "  firstOnChangeCalled = false;"
-    "  secondOnChangeCalled = false;"
-    "  document.getElementById('first_password').onchange = function() {"
-    "    firstOnChangeCalled = true;"
-    "  };"
-    "  document.getElementById('second_password').onchange = function() {"
-    "    secondOnChangeCalled = true;"
-    "  };"
-    "</script>";
-
 const char kPasswordChangeFormHTML[] =
     "<FORM name = 'ChangeWithUsernameForm' action = 'http://www.bidule.com'> "
     "  <INPUT type = 'text' id = 'username'/> "
     "  <INPUT type = 'password' id = 'password'/> "
     "  <INPUT type = 'password' id = 'newpassword'/> "
     "  <INPUT type = 'password' id = 'confirmpassword'/> "
     "  <INPUT type = 'button' id = 'dummy'/> "
     "  <INPUT type = 'submit' value = 'Login'/> "
     "</FORM>";
 
@@ skipping 34 matching lines @@
   // This doesn't trigger because the form action is invalid.
   LoadHTMLWithUserGesture(kInvalidActionAccountCreationFormHTML);
   SetNotBlacklistedMessage(password_generation_,
                            kInvalidActionAccountCreationFormHTML);
   SetAccountCreationFormsDetectedMessage(password_generation_,
                                          GetMainFrame()->document(), 0, 1);
   ExpectGenerationAvailable("first_password", false);
 }
 
 TEST_F(PasswordGenerationAgentTest, FillTest) {
+  // Add event listeners for password fields.
+  std::vector<base::string16> variables_to_check;
+  std::string events_registration_script =
+      CreateScriptToRegisterListeners("first_password", &variables_to_check) +
+      CreateScriptToRegisterListeners("second_password", &variables_to_check);
+
   // Make sure that we are enabled before loading HTML.
-  std::string html = std::string(kAccountCreationFormHTML) +
-      ChangeDetectionScript;
+  std::string html =
+      std::string(kAccountCreationFormHTML) + events_registration_script;
   LoadHTMLWithUserGesture(html.c_str());
   SetNotBlacklistedMessage(password_generation_, html.c_str());
   SetAccountCreationFormsDetectedMessage(password_generation_,
                                          GetMainFrame()->document(), 0, 1);
 
   WebDocument document = GetMainFrame()->document();
   WebElement element =
       document.getElementById(WebString::fromUTF8("first_password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement first_password_element = element.to<WebInputElement>();
   element = document.getElementById(WebString::fromUTF8("second_password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement second_password_element = element.to<WebInputElement>();
 
   // Both password fields should be empty.
   EXPECT_TRUE(first_password_element.value().isNull());
   EXPECT_TRUE(second_password_element.value().isNull());
 
   base::string16 password = base::ASCIIToUTF16("random_password");
   password_generation_->GeneratedPasswordAccepted(password);
 
   // Password fields are filled out and set as being autofilled.
   EXPECT_EQ(password, first_password_element.value().utf16());
   EXPECT_EQ(password, second_password_element.value().utf16());
   EXPECT_TRUE(first_password_element.isAutofilled());
   EXPECT_TRUE(second_password_element.isAutofilled());
 
-  // Make sure onchange events are called.
-  int first_onchange_called = -1;
-  int second_onchange_called = -1;
-  ASSERT_TRUE(
-      ExecuteJavaScriptAndReturnIntValue(
-          base::ASCIIToUTF16("firstOnChangeCalled ? 1 : 0"),
-          &first_onchange_called));
-  EXPECT_EQ(1, first_onchange_called);
-  ASSERT_TRUE(
-      ExecuteJavaScriptAndReturnIntValue(
-          base::ASCIIToUTF16("secondOnChangeCalled ? 1 : 0"),
-          &second_onchange_called));
-  EXPECT_EQ(1, second_onchange_called);
+  // Make sure all events are called.
+  for (const base::string16& variable : variables_to_check) {
+    int value;
+    EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(variable, &value));
+    EXPECT_EQ(1, value) << variable;
+  }
 
   // Focus moved to the next input field.
   // TODO(zysxqn): Change this back to the address element once Bug 90224
   // https://bugs.webkit.org/show_bug.cgi?id=90224 has been fixed.
   element = document.getElementById(WebString::fromUTF8("first_password"));
   ASSERT_FALSE(element.isNull());
   EXPECT_EQ(element, document.focusedElement());
 }
 
 TEST_F(PasswordGenerationAgentTest, EditingTest) {
@@ skipping 432 matching lines @@
 
     // Click on another HTML element.
     const char* const click_target_name =
         clickOnInputField ? kTextFieldId : kSpanId;
     EXPECT_TRUE(SimulateElementClick(click_target_name));
     EXPECT_FALSE(input.shouldRevealPassword());
   }
 }
 
 }  // namespace autofill