[Autofill/Autocomplete Feature] Substring matching instead of prefix matching.

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/renderer/autofill/password_generation_test_utils.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"
@@ skipping 983 matching lines @@
       username_element_, kBobUsername, kCarolPassword));
   CheckTextFieldsDOMState(kBobUsername, true, kCarolPassword, true);
   username_length = strlen(kBobUsername);
   CheckUsernameSelection(username_length, username_length);
 }
 
 // Tests that |PreviewSuggestion| properly previews the username and password.
 TEST_F(PasswordAutofillAgentTest, PreviewSuggestion) {
   // Simulate the browser sending the login info, but set |wait_for_username|
   // to prevent the form from being immediately filled.
+  size_t match_start = 0;
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   // Neither field should have been autocompleted.
   CheckTextFieldsDOMState(std::string(), false, std::string(), false);
 
   // If the password field is not autocompletable, it should not be affected.
   SetElementReadOnly(password_element_, true);
   EXPECT_FALSE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
   EXPECT_EQ(std::string(), username_element_.suggestedValue().utf8());
   EXPECT_FALSE(username_element_.isAutofilled());
   EXPECT_EQ(std::string(), password_element_.suggestedValue().utf8());
   EXPECT_FALSE(password_element_.isAutofilled());
   SetElementReadOnly(password_element_, false);
 
   // After selecting the suggestion, both fields should be previewed
   // with suggested values.
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
   EXPECT_EQ(
       kAliceUsername,
       static_cast<std::string>(username_element_.suggestedValue().utf8()));
   EXPECT_TRUE(username_element_.isAutofilled());
   EXPECT_EQ(
       kAlicePassword,
       static_cast<std::string>(password_element_.suggestedValue().utf8()));
   EXPECT_TRUE(password_element_.isAutofilled());
   int username_length = strlen(kAliceUsername);
   CheckUsernameSelection(0, username_length);
 
   // Try previewing with a password different from the one that was initially
   // sent to the renderer.
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kBobUsername, kCarolPassword));
+      username_element_, kBobUsername, kCarolPassword, match_start));
   EXPECT_EQ(
       kBobUsername,
       static_cast<std::string>(username_element_.suggestedValue().utf8()));
   EXPECT_TRUE(username_element_.isAutofilled());
   EXPECT_EQ(
       kCarolPassword,
       static_cast<std::string>(password_element_.suggestedValue().utf8()));
   EXPECT_TRUE(password_element_.isAutofilled());
   username_length = strlen(kBobUsername);
   CheckUsernameSelection(0, username_length);
 }
 
 // Tests that |PreviewSuggestion| properly sets the username selection range.
 TEST_F(PasswordAutofillAgentTest, PreviewSuggestionSelectionRange) {
+  size_t match_start = 0;
   username_element_.setValue(WebString::fromUTF8("ali"));
   username_element_.setSelectionRange(3, 3);
   username_element_.setAutofilled(true);
 
   CheckTextFieldsDOMState("ali", true, std::string(), false);
 
   // Simulate the browser sending the login info, but set |wait_for_username|
   // to prevent the form from being immediately filled.
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
   EXPECT_EQ(
       kAliceUsername,
       static_cast<std::string>(username_element_.suggestedValue().utf8()));
   EXPECT_TRUE(username_element_.isAutofilled());
   EXPECT_EQ(
       kAlicePassword,
       static_cast<std::string>(password_element_.suggestedValue().utf8()));
   EXPECT_TRUE(password_element_.isAutofilled());
   int username_length = strlen(kAliceUsername);
   CheckUsernameSelection(3, username_length);
 }
 
 // Tests that |ClearPreview| properly clears previewed username and password
 // with password being previously autofilled.
 TEST_F(PasswordAutofillAgentTest, ClearPreviewWithPasswordAutofilled) {
+  size_t match_start = 0;
   password_element_.setValue(WebString::fromUTF8("sec"));
   password_element_.setAutofilled(true);
 
   // Simulate the browser sending the login info, but set |wait_for_username|
   // to prevent the form from being immediately filled.
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   CheckTextFieldsDOMState(std::string(), false, "sec", true);
 
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
 
   EXPECT_TRUE(
       password_autofill_agent_->DidClearAutofillSelection(username_element_));
 
   EXPECT_TRUE(username_element_.value().isEmpty());
   EXPECT_TRUE(username_element_.suggestedValue().isEmpty());
   EXPECT_FALSE(username_element_.isAutofilled());
   EXPECT_EQ(ASCIIToUTF16("sec"), password_element_.value());
   EXPECT_TRUE(password_element_.suggestedValue().isEmpty());
   EXPECT_TRUE(password_element_.isAutofilled());
   CheckUsernameSelection(0, 0);
 }
 
 // Tests that |ClearPreview| properly clears previewed username and password
 // with username being previously autofilled.
 TEST_F(PasswordAutofillAgentTest, ClearPreviewWithUsernameAutofilled) {
+  size_t match_start = 0;
   username_element_.setValue(WebString::fromUTF8("ali"));
   username_element_.setSelectionRange(3, 3);
   username_element_.setAutofilled(true);
 
   // Simulate the browser sending the login info, but set |wait_for_username|
   // to prevent the form from being immediately filled.
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   CheckTextFieldsDOMState("ali", true, std::string(), false);
 
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
 
   EXPECT_TRUE(
       password_autofill_agent_->DidClearAutofillSelection(username_element_));
 
   EXPECT_EQ(ASCIIToUTF16("ali"), username_element_.value());
   EXPECT_TRUE(username_element_.suggestedValue().isEmpty());
   EXPECT_TRUE(username_element_.isAutofilled());
   EXPECT_TRUE(password_element_.value().isEmpty());
   EXPECT_TRUE(password_element_.suggestedValue().isEmpty());
   EXPECT_FALSE(password_element_.isAutofilled());
   CheckUsernameSelection(3, 3);
 }
 
 // Tests that |ClearPreview| properly clears previewed username and password
 // with username and password being previously autofilled.
 TEST_F(PasswordAutofillAgentTest,
        ClearPreviewWithAutofilledUsernameAndPassword) {
+  size_t match_start = 0;
   username_element_.setValue(WebString::fromUTF8("ali"));
   username_element_.setSelectionRange(3, 3);
   username_element_.setAutofilled(true);
   password_element_.setValue(WebString::fromUTF8("sec"));
   password_element_.setAutofilled(true);
 
   // Simulate the browser sending the login info, but set |wait_for_username|
   // to prevent the form from being immediately filled.
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   CheckTextFieldsDOMState("ali", true, "sec", true);
 
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
 
   EXPECT_TRUE(
       password_autofill_agent_->DidClearAutofillSelection(username_element_));
 
   EXPECT_EQ(ASCIIToUTF16("ali"), username_element_.value());
   EXPECT_TRUE(username_element_.suggestedValue().isEmpty());
   EXPECT_TRUE(username_element_.isAutofilled());
   EXPECT_EQ(ASCIIToUTF16("sec"), password_element_.value());
   EXPECT_TRUE(password_element_.suggestedValue().isEmpty());
   EXPECT_TRUE(password_element_.isAutofilled());
   CheckUsernameSelection(3, 3);
 }
 
 // Tests that |ClearPreview| properly clears previewed username and password
 // with neither username nor password being previously autofilled.
 TEST_F(PasswordAutofillAgentTest,
        ClearPreviewWithNotAutofilledUsernameAndPassword) {
   // Simulate the browser sending the login info, but set |wait_for_username|
   // to prevent the form from being immediately filled.
+  size_t match_start = 0;
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   CheckTextFieldsDOMState(std::string(), false, std::string(), false);
 
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, kAliceUsername, kAlicePassword));
+      username_element_, kAliceUsername, kAlicePassword, match_start));
 
   EXPECT_TRUE(
       password_autofill_agent_->DidClearAutofillSelection(username_element_));
 
   EXPECT_TRUE(username_element_.value().isEmpty());
   EXPECT_TRUE(username_element_.suggestedValue().isEmpty());
   EXPECT_FALSE(username_element_.isAutofilled());
   EXPECT_TRUE(password_element_.value().isEmpty());
   EXPECT_TRUE(password_element_.suggestedValue().isEmpty());
   EXPECT_FALSE(password_element_.isAutofilled());
@@ skipping 10 matching lines @@
   ClearUsernameAndPasswordFields();
 
   // Simulate the user typing in the first letter of 'alice', a stored username.
   SimulateUsernameChange("a");
   // Both the username and password text fields should reflect selection of the
   // stored login.
   CheckTextFieldsDOMState(kAliceUsername, true, kAlicePassword, true);
   // The selection should have been set to 'lice', the last 4 letters.
   CheckUsernameSelection(1, 5);
 
+  size_t match_start = 0;
   EXPECT_TRUE(password_autofill_agent_->PreviewSuggestion(
-      username_element_, "alicia", "secret"));
+      username_element_, "alicia", "secret", match_start));
   EXPECT_EQ(
       "alicia",
       static_cast<std::string>(username_element_.suggestedValue().utf8()));
   EXPECT_TRUE(username_element_.isAutofilled());
   EXPECT_EQ(
       "secret",
       static_cast<std::string>(password_element_.suggestedValue().utf8()));
   EXPECT_TRUE(password_element_.isAutofilled());
   CheckUsernameSelection(1, 6);
 
@@ skipping 801 matching lines @@
   // Simulate a user clicking on the password element. This should produce no
   // message.
   render_thread_->sink().ClearMessages();
   static_cast<PageClickListener*>(autofill_agent_)
       ->FormControlElementClicked(password_element_, false);
   EXPECT_FALSE(render_thread_->sink().GetFirstMessageMatching(
       AutofillHostMsg_ShowPasswordSuggestions::ID));
 }
 
 }  // namespace autofill