Autocomplete and AutoFill entries are shown combined in the suggestions popup.

These changes merge popup menu suggestions for Autocomplete and AutoFill.  Suggestions are collected from both sources and returned to the renderer as a single list.  This combined list is given to WebKit to display in the suggestions popup.  When the user selects an item in the popup the appropriate result gets filled in the fields.

BUG=41328
TEST=AutoFillManagerTest.*

Review URL: http://codereview.chromium.org/2878020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51736 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index b914553..9b9640e 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -987,11 +987,13 @@ TEST_F(RenderViewTest, SendForms) {
   WebDocument document = web_frame->document();
   WebInputElement firstname =
       document.getElementById("firstname").to<WebInputElement>();
-  // didAcceptAutoFillSuggestions expects a non-zero number of suggestions.
-  view_->suggestions_count_ = 1;
+
+  // Accept suggestion that contains a label.  Labeled items indicate AutoFill
+  // as opposed to Autocomplete.  We're testing this distinction below with
+  // the |ViewHostMsg_FillAutoFillFormData::ID| message.
   view_->didAcceptAutoFillSuggestion(firstname,
-                                     WebKit::WebString(),
-                                     WebKit::WebString(),
+                                     WebKit::WebString::fromUTF8("Johnny"),
+                                     WebKit::WebString::fromUTF8("Home"),
                                      -1);
 
   ProcessPendingMessages();
@@ -1065,8 +1067,6 @@ TEST_F(RenderViewTest, FillFormElement) {
   WebInputElement middlename =
       document.getElementById("middlename").to<WebInputElement>();
   middlename.setAutofilled(true);
-  // didAcceptAutoFillSuggestions expects a non-zero number of suggestions.
-  view_->suggestions_count_ = 4;
 
   // Accept a suggestion in a form that has been auto-filled.  This triggers
   // the direct filling of the firstname element with value parameter.