[Password Autofill] Make better use of prefilled usernames.

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/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
@@ skipping 322 matching lines @@
   fill_data_.basic_data.action = GURL(origin);
 
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   // The username and password should have been autocompleted.
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }
 
-// Tests that if a password or input element is marked as readonly, neither
-// field is autofilled on page load.
-TEST_F(PasswordAutofillAgentTest, NoInitialAutocompleteForReadOnly) {
+// Tests that if a password is marked as readonly, neither field is autofilled
+// on page load.
+TEST_F(PasswordAutofillAgentTest, NoInitialAutocompleteForReadOnlyPassword) {
   password_element_.setAttribute(WebString::fromUTF8("readonly"),
                                  WebString::fromUTF8("true"));
 
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   CheckTextFieldsState(std::string(), false, std::string(), false);
 }
 
+// Can still fill a password field if the username is set to a value that
+// matches.
+TEST_F(PasswordAutofillAgentTest,
+       AutocompletePasswordForReadonlyUsernameMatched) {
+  username_element_.setValue(username3_);
+  username_element_.setAttribute(WebString::fromUTF8("readonly"),
+                                 WebString::fromUTF8("true"));
+
+  // Filled even though username is not the preferred match.
+  SimulateOnFillPasswordForm(fill_data_);
+  CheckTextFieldsState(UTF16ToUTF8(username3_), true,
+                       UTF16ToUTF8(password3_), true);
+}
+
+// If a username field is empty and readonly, don't autofill.
+TEST_F(PasswordAutofillAgentTest,
+       NoAutocompletePasswordForReadonlyUsernameUnmatched) {
+  username_element_.setValue(WebString::fromUTF8(""));
+  username_element_.setAttribute(WebString::fromUTF8("readonly"),
+                                 WebString::fromUTF8("true"));
+
+  SimulateOnFillPasswordForm(fill_data_);
+  CheckTextFieldsState(std::string(), false, std::string(), false);
+}
+
 // Tests that having a non-matching username precludes the autocomplete.
-TEST_F(PasswordAutofillAgentTest, NoInitialAutocompleteForFilledField) {
+TEST_F(PasswordAutofillAgentTest, NoAutocompleteForFilledFieldUnmatched) {
   username_element_.setValue(WebString::fromUTF8("bogus"));
 
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Neither field should be autocompleted.
   CheckTextFieldsState("bogus", false, std::string(), false);
 }
 
+// Don't try and complete a prefilled value even if it's a partial match

[Ilya Sherman, 2013/11/05 01:25:12]

nit: "try and" -> "try to".

[Garrett Casto, 2013/11/05 01:56:39]

Done.

+// to a username.
+TEST_F(PasswordAutofillAgentTest, NoPartialMatchForPrefilledUsername) {
+  username_element_.setValue(WebString::fromUTF8("ali"));
+
+  SimulateOnFillPasswordForm(fill_data_);
+
+  CheckTextFieldsState("ali", false, std::string(), false);
+}
+
 // Tests that we do not autofill username/passwords if marked as
 // autocomplete="off".
 TEST_F(PasswordAutofillAgentTest, NoInitialAutocompleteForAutocompleteOff) {
   username_element_.setAttribute(WebString::fromUTF8("autocomplete"),
                                  WebString::fromUTF8("off"));
 
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
@@ skipping 267 matching lines @@
   EXPECT_TRUE(render_thread_->sink().GetFirstMessageMatching(
       AutofillHostMsg_PasswordFormsRendered::ID));
 
   render_thread_->sink().ClearMessages();
   LoadHTML(kWebpageWithDynamicContent);
   EXPECT_TRUE(render_thread_->sink().GetFirstMessageMatching(
       AutofillHostMsg_PasswordFormsRendered::ID));
 }
 
 }  // namespace autofill