[Autofill] Fill fields if they contain a default value.

chrome/renderer/autofill/form_autofill_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 <stddef.h>
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/macros.h"
@@ skipping 1039 matching lines @@
     expected.value = ASCIIToUTF16("Yellow");
     expected.is_autofilled = true;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[unowned_offset + 1]);
 
     expected.name = ASCIIToUTF16("cantelope");
     expected.value = ASCIIToUTF16("Also Yellow");
     expected.is_autofilled = true;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[unowned_offset + 2]);
   }
 
-  void TestFillFormNonEmptyField(const char* html, bool unowned) {
+  void TestFillFormNonEmptyField(const char* html,
+                                 bool unowned,
+                                 const char* initial_lastname,
+                                 const char* initial_email) {
     LoadHTML(html);
     WebFrame* web_frame = GetMainFrame();
     ASSERT_NE(nullptr, web_frame);
 
     FormCache form_cache(*web_frame);
     std::vector<FormData> forms = form_cache.ExtractNewForms();
     ASSERT_EQ(1U, forms.size());
 
     // Get the input element we want to find.
     WebInputElement input_element = GetInputElementById("firstname");
@@ skipping 19 matching lines @@
     FormFieldData expected;
     expected.form_control_type = "text";
     expected.max_length = WebInputElement::defaultMaxLength();
 
     expected.name = ASCIIToUTF16("firstname");
     expected.value = ASCIIToUTF16("Wy");
     expected.is_autofilled = false;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[0]);
 
     expected.name = ASCIIToUTF16("lastname");
-    expected.value.clear();
+    if (initial_lastname) {
+      expected.label = ASCIIToUTF16(initial_lastname);
+      expected.value = ASCIIToUTF16(initial_lastname);
+    } else {
+      expected.label.clear();
+      expected.value.clear();
+    }
     expected.is_autofilled = false;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]);
 
     expected.name = ASCIIToUTF16("email");
-    expected.value.clear();
+    if (initial_email) {
+      expected.label = ASCIIToUTF16(initial_email);
+      expected.value = ASCIIToUTF16(initial_email);
+    } else {
+      expected.label.clear();
+      expected.value.clear();
+    }
     expected.is_autofilled = false;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
 
     // Preview the form and verify that the cursor position has been updated.
     form.fields[0].value = ASCIIToUTF16("Wyatt");
     form.fields[1].value = ASCIIToUTF16("Earp");
     form.fields[2].value = ASCIIToUTF16("wyatt@example.com");
     form.fields[0].is_autofilled = true;
     form.fields[1].is_autofilled = true;
     form.fields[2].is_autofilled = true;
@@ skipping 14 matching lines @@
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
       EXPECT_EQ(GURL("http://buh.com"), form2.action);
     }
 
     const std::vector<FormFieldData>& fields2 = form2.fields;
     ASSERT_EQ(3U, fields2.size());
 
     expected.name = ASCIIToUTF16("firstname");
     expected.value = ASCIIToUTF16("Wyatt");
+    expected.label.clear();
     expected.is_autofilled = true;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
 
     expected.name = ASCIIToUTF16("lastname");
     expected.value = ASCIIToUTF16("Earp");
+    expected.label.clear();
     expected.is_autofilled = true;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
 
     expected.name = ASCIIToUTF16("email");
     expected.value = ASCIIToUTF16("wyatt@example.com");
+    expected.label.clear();
     expected.is_autofilled = true;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
 
     // Verify that the cursor position has been updated.
     EXPECT_EQ(5, input_element.selectionStart());
     EXPECT_EQ(5, input_element.selectionEnd());
   }
 
   void TestClearFormWithNode(const char* html, bool unowned) {
     LoadHTML(html);
@@ skipping 2792 matching lines @@
 // profile from the Autofill suggestions popup.  The field that is being typed
 // into should be filled even though it's not technically empty.
 TEST_F(FormAutofillTest, FillFormNonEmptyField) {
   TestFillFormNonEmptyField(
       "<FORM name='TestForm' action='http://buh.com' method='post'>"
       "  <INPUT type='text' id='firstname'/>"
       "  <INPUT type='text' id='lastname'/>"
       "  <INPUT type='text' id='email'/>"
       "  <INPUT type='submit' value='Send'/>"
       "</FORM>",
-      false);
+      false, nullptr, nullptr);
+}
+
+TEST_F(FormAutofillTest, FillFormNonEmptyFieldsWithDefaultValues) {
+  TestFillFormNonEmptyField(
+      "<FORM name='TestForm' action='http://buh.com' method='post'>"

[vabr (Chromium), 2016/02/16 18:12:32]

Bösen & Heinke? :)

[Mathieu, 2016/02/16 20:03:45]

wasn't sure if that was a serious comment, so I changed it to abc.com :)

[vabr (Chromium), 2016/02/17 09:21:38]

I was merely curious, what made you chose Bösen & Heinke homepage as the
example, but I had nothing against it (neither I have anything against abc.com).
:)

+      "  <INPUT type='text' id='firstname' value='Enter first name'/>"
+      "  <INPUT type='text' id='lastname' value='Enter last name'/>"
+      "  <INPUT type='text' id='email' value='Enter email'/>"
+      "  <INPUT type='submit' value='Send'/>"
+      "</FORM>",
+      false, "Enter last name", "Enter email");
 }
 
 TEST_F(FormAutofillTest, FillFormNonEmptyFieldForUnownedForm) {
   TestFillFormNonEmptyField(
       "<HEAD><TITLE>delivery recipient info</TITLE></HEAD>"
       "<INPUT type='text' id='firstname'/>"
       "<INPUT type='text' id='lastname'/>"
       "<INPUT type='text' id='email'/>"
       "<INPUT type='submit' value='Send'/>",
-      true);
+      true, nullptr, nullptr);
 }
 
 TEST_F(FormAutofillTest, ClearFormWithNode) {
   TestClearFormWithNode(
       "<FORM name='TestForm' action='http://buh.com' method='post'>"
       "  <INPUT type='text' id='firstname' value='Wyatt'/>"
       "  <INPUT type='text' id='lastname' value='Earp'/>"
       "  <INPUT type='text' autocomplete='off' id='noAC' value='one'/>"
       "  <INPUT type='text' id='notenabled' disabled='disabled'>"
       "  <INPUT type='month' id='month' value='2012-11'>"
@@ skipping 519 matching lines @@
 
     if (test_case.has_extracted_form) {
       EXPECT_EQ(test_case.is_form_tag, forms[0].is_form_tag);
       EXPECT_EQ(test_case.is_formless_checkout, forms[0].is_formless_checkout);
     }
   }
 }
 
 }  // namespace form_util
 }  // namespace autofill