Reland "Do not haul suggestions back to browser in AutofillHostMsg_ShowPasswordSuggestions"

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"
@@ skipping 367 matching lines @@
                                     password,
                                     password_autofilled,
                                     false);
   }
 
   void CheckUsernameSelection(int start, int end) {
     EXPECT_EQ(start, username_element_.selectionStart());
     EXPECT_EQ(end, username_element_.selectionEnd());
   }
 
-  void ExpectOneCredential(const base::string16& username) {
+  // Checks the message sent to PasswordAutofillManager to build the suggestion
+  // list. |username| is the expected username field value, and |show_all| is
+  // the expected flag for the PasswordAutofillManager, whether to show all
+  // suggestions, or only those starting with |username|.
+  void CheckSuggestions(const std::string& username, bool show_all) {
     const IPC::Message* message =
         render_thread_->sink().GetFirstMessageMatching(
             AutofillHostMsg_ShowPasswordSuggestions::ID);
-    ASSERT_TRUE(message);
-    Tuple4<autofill::FormFieldData,
-           gfx::RectF,
-           std::vector<base::string16>,
-           std::vector<base::string16> > args;
+    EXPECT_TRUE(message);
+    Tuple4<autofill::FormFieldData, base::string16, bool, gfx::RectF> args;
     AutofillHostMsg_ShowPasswordSuggestions::Read(message, &args);
-    ASSERT_EQ(1u, args.c.size());
-    EXPECT_TRUE(args.c[0] == username);
-  }
-
-  void ExpectAllCredentials() {
-    std::set<base::string16> usernames;
-    usernames.insert(username1_);
-    usernames.insert(username2_);
-    usernames.insert(username3_);
-    usernames.insert(alternate_username3_);
-
-    const IPC::Message* message =
-        render_thread_->sink().GetFirstMessageMatching(
-            AutofillHostMsg_ShowPasswordSuggestions::ID);
-    ASSERT_TRUE(message);
-    Tuple4<autofill::FormFieldData,
-           gfx::RectF,
-           std::vector<base::string16>,
-           std::vector<base::string16> > args;
-    AutofillHostMsg_ShowPasswordSuggestions::Read(message, &args);
-    ASSERT_EQ(4u, args.c.size());
-    std::set<base::string16>::iterator it;
-
-    for (int i = 0; i < 4; i++) {
-      it = usernames.find(args.c[i]);
-      EXPECT_TRUE(it != usernames.end());
-      if (it != usernames.end())
-        usernames.erase(it);
-    }
-
-    EXPECT_TRUE(usernames.empty());
+    EXPECT_EQ(2u, fill_data_.basic_data.fields.size());
+    EXPECT_EQ(fill_data_.basic_data.fields[0].name, args.a.name);
+    EXPECT_EQ(ASCIIToUTF16(username), args.a.value);
+    EXPECT_EQ(ASCIIToUTF16(username), args.b);
+    EXPECT_EQ(show_all, args.c);
 
     render_thread_->sink().ClearMessages();
   }
 
   void ExpectFormSubmittedWithPasswords(const std::string& password_value,
                                         const std::string& new_password_value) {
     const IPC::Message* message =
         render_thread_->sink().GetFirstMessageMatching(
             AutofillHostMsg_PasswordFormSubmitted::ID);
     ASSERT_TRUE(message);
@@ skipping 918 matching lines @@
 TEST_F(PasswordAutofillAgentTest, ClickAndSelect) {
   // SimulateElementClick() is called so that a user gesture is actually made
   // and the password can be filled. However, SimulateElementClick() does not
   // actually lead to the AutofillAgent's InputElementClicked() method being
   // called, so SimulateSuggestionChoice has to manually call
   // InputElementClicked().
   ClearUsernameAndPasswordFields();
   SimulateOnFillPasswordForm(fill_data_);
   SimulateElementClick(kUsernameName);
   SimulateSuggestionChoice(username_element_);
-  ExpectAllCredentials();
+  CheckSuggestions(kAliceUsername, true);
 
   CheckTextFieldsDOMState(kAliceUsername, true, kAlicePassword, true);
 }
 
 // Tests the autosuggestions that are given when the element is clicked.
 // Specifically, tests when the user clicks on the username element after page
 // load and the element is autofilled, when the user clicks on an element that
 // has a non-matching username, and when the user clicks on an element that's
 // already been autofilled and they've already modified.
 TEST_F(PasswordAutofillAgentTest, CredentialsOnClick) {
   // Simulate the browser sending back the login info.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Clear the text fields to start fresh.
   ClearUsernameAndPasswordFields();
 
   // Call SimulateElementClick() to produce a user gesture on the page so
   // autofill will actually fill.
   SimulateElementClick(kUsernameName);
 
   // Simulate a user clicking on the username element. This should produce a
   // message with all the usernames.
   render_thread_->sink().ClearMessages();
   static_cast<PageClickListener*>(autofill_agent_)
       ->FormControlElementClicked(username_element_, false);
-  ExpectAllCredentials();
+  CheckSuggestions(std::string(), false);
 
   // Now simulate a user typing in an unrecognized username and then
   // clicking on the username element. This should also produce a message with
   // all the usernames.
   SimulateUsernameChange("baz", true);
   render_thread_->sink().ClearMessages();
   static_cast<PageClickListener*>(autofill_agent_)
       ->FormControlElementClicked(username_element_, true);
-  ExpectAllCredentials();
+  CheckSuggestions("baz", true);
 
   // Now simulate a user typing in the first letter of the username and then
   // clicking on the username element. While the typing of the first letter will
   // inline autocomplete, clicking on the element should still produce a full
   // suggestion list.
   SimulateUsernameChange("a", true);
   render_thread_->sink().ClearMessages();
   static_cast<PageClickListener*>(autofill_agent_)
       ->FormControlElementClicked(username_element_, true);
-  ExpectAllCredentials();
+  CheckSuggestions(kAliceUsername, true);
 }
 
 #endif  // !defined(OS_ANDROID)
 
 // The user types in a password, but then just before sending the form off, a
 // script clears that password. This test checks that PasswordAutofillAgent can
 // still remember the password typed by the user.
 TEST_F(PasswordAutofillAgentTest,
        RememberLastNonEmptyPasswordOnSubmit_ScriptCleared) {
   SimulateInputChangeForElement(
@@ skipping 114 matching lines @@
                                 password_element_,
                                 /*is_user_input=*/true);
 
   // Simulate the user typing a stored username.
   SimulateUsernameChange(kAliceUsername, true);
   // The autofileld password should replace the typed one.
   CheckTextFieldsDOMState(kAliceUsername, true, kAlicePassword, true);
 }
 
 }  // namespace autofill