Remove PasswordAutofillAgent::TextFieldDidEndEditing

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 <tuple>
 
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 345 matching lines @@
     return element.to<blink::WebInputElement>();
   }
 
   void ClearUsernameAndPasswordFields() {
     username_element_.setValue("");
     username_element_.setAutofilled(false);
     password_element_.setValue("");
     password_element_.setAutofilled(false);
   }
 
-  void SimulateDidEndEditing(WebFrame* input_frame, WebInputElement& input) {
-    static_cast<blink::WebAutofillClient*>(autofill_agent_)
-        ->textFieldDidEndEditing(input);
-  }
-
   void SimulateSuggestionChoice(WebInputElement& username_input) {
     base::string16 username(base::ASCIIToUTF16(kAliceUsername));
     base::string16 password(base::ASCIIToUTF16(kAlicePassword));
     SimulateSuggestionChoiceOfUsernameAndPassword(username_input, username,
                                                   password);
   }
 
   void SimulateSuggestionChoiceOfUsernameAndPassword(
       WebInputElement& input,
       const base::string16& username,
@@ skipping 367 matching lines @@
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Simulate the user changing the username to some unknown username.
   SimulateUsernameChange("alicia");
 
   // The password should not have been cleared.
   CheckTextFieldsDOMState("alicia", false, kAlicePassword, true);
 }
 
-// Tests that we only autocomplete on focus lost and with a full username match
-// when |wait_for_username| is true.
+// Tests that lost focus does not trigger filling when |wait_for_username| is
+// true.
 TEST_F(PasswordAutofillAgentTest, WaitUsername) {
   // Simulate the browser sending back the login info.
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   // No auto-fill should have taken place.
   CheckTextFieldsState(std::string(), false, std::string(), false);
 
+  SimulateUsernameChange(kAliceUsername);
+  // Change focus in between to make sure blur events don't trigger filling.
+  SetFocused(password_element_);
+  SetFocused(username_element_);
   // No autocomplete should happen when text is entered in the username.
-  SimulateUsernameChange("a");
-  CheckTextFieldsState("a", false, std::string(), false);
-  SimulateUsernameChange("al");
-  CheckTextFieldsState("al", false, std::string(), false);
-  SimulateUsernameChange(kAliceUsername);
   CheckTextFieldsState(kAliceUsername, false, std::string(), false);
-
-  // Autocomplete should happen only when the username textfield is blurred with
-  // a full match.
-  SimulateUsernameChange("a");
-  static_cast<blink::WebAutofillClient*>(autofill_agent_)
-      ->textFieldDidEndEditing(username_element_);
-  CheckTextFieldsState("a", false, std::string(), false);
-  SimulateUsernameChange("al");
-  static_cast<blink::WebAutofillClient*>(autofill_agent_)
-      ->textFieldDidEndEditing(username_element_);
-  CheckTextFieldsState("al", false, std::string(), false);
-  SimulateUsernameChange("alices");
-  static_cast<blink::WebAutofillClient*>(autofill_agent_)
-      ->textFieldDidEndEditing(username_element_);
-  CheckTextFieldsState("alices", false, std::string(), false);
-  SimulateUsernameChange(kAliceUsername);
-  static_cast<blink::WebAutofillClient*>(autofill_agent_)
-      ->textFieldDidEndEditing(username_element_);
-  CheckTextFieldsDOMState(kAliceUsername, true, kAlicePassword, true);
 }
 
 TEST_F(PasswordAutofillAgentTest, IsWebNodeVisibleTest) {
   blink::WebVector<blink::WebFormElement> forms1, forms2, forms3;
   blink::WebFrame* frame;
 
   LoadHTML(kVisibleFormWithNoUsernameHTML);
   frame = GetMainFrame();
   frame->document().forms(forms1);
   ASSERT_EQ(1u, forms1.size());
@@ skipping 657 matching lines @@
   password_element_.setValue(WebString());
   static_cast<content::RenderFrameObserver*>(password_autofill_agent_)
       ->WillSubmitForm(username_element_.form());
 
   // Observe that the PasswordAutofillAgent still remembered the last non-empty
   // password and sent that to the browser.
   ExpectFormSubmittedWithUsernameAndPasswords("temp", "", "random");
 }
 
 // The user first accepts a suggestion, but then overwrites the password. This
-// test checks that the overwritten password is not reverted back if the user
-// triggers autofill through focusing (but not changing) the username again.
+// test checks that the overwritten password is not reverted back.
 TEST_F(PasswordAutofillAgentTest,
        NoopEditingDoesNotOverwriteManuallyEditedPassword) {
-  // Simulate having credentials which needed to wait until the user starts
-  // typing the username to be filled (e.g., PSL-matched credentials). Those are
-  // the ones which can be filled as a result of TextFieldDidEndEditing.
   fill_data_.wait_for_username = true;
+  SimulateUsernameChange(kAliceUsername);
   SimulateOnFillPasswordForm(fill_data_);
-  // Simulate that the user typed their name to make the autofill work.
-  SimulateUsernameChange(kAliceUsername);
-  SimulateDidEndEditing(GetMainFrame(), username_element_);
+  SimulateSuggestionChoice(username_element_);
   const std::string old_username(username_element_.value().utf8());
   const std::string old_password(password_element_.value().utf8());
   const std::string new_password(old_password + "modify");
 
   // The user changes the password.
   SimulatePasswordChange(new_password);
 
-  // The user switches back into the username field, but leaves that without
-  // changes.
-  SimulateDidEndEditing(GetMainFrame(), username_element_);
+  // Change focus in between to make sure blur events don't trigger filling.
+  SetFocused(password_element_);
+  SetFocused(username_element_);
 
   // The password should have stayed as the user changed it.
   CheckTextFieldsDOMState(old_username, true, new_password, false);
   // The password should not have a suggested value.
   CheckTextFieldsState(old_username, true, std::string(), false);
 }
 
 // The user types in a username and a password, but then just before sending
 // the form off, a script changes them. This test checks that
 // PasswordAutofillAgent can still remember the username and the password
@@ skipping 944 matching lines @@
   EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching(
       AutofillHostMsg_ShowPasswordSuggestions::ID));
 
   // But when the user clicks on the autofilled password field again it should
   // still produce a suggestion dropdown.
   SimulateElementClick("password");
   CheckSuggestions("", false);
 }
 
 }  // namespace autofill