Do not autofill element when there is no autofill suggestion from profile

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 <vector>
 
 #include "base/format_macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 33 matching lines @@
 using blink::WebVector;
 
 namespace {
 
 struct AutofillFieldCase {
   const char* const form_control_type;
   const char* const name;
   const char* const initial_value;
   const char* const autocomplete_attribute;  // The autocomplete attribute of
                                              // the element.
-  bool should_be_autofilled;   // Whether the filed should be autofilled.
+  bool is_autofilled;  // Whether the FormFieldData field is autofilled.

[Ilya Sherman, 2014/06/03 20:39:31]

It seems like this is always identical to should_be_autofilled.  Do you really
need the new member in the struct, or can you simply reuse the existing member?

+  bool should_be_autofilled;  // Whether the filed should be autofilled.
   const char* const autofill_value;  // The value being used to fill the field.
   const char* const expected_value;  // The expected value after Autofill
                                      // or Preview.
 };
 
 static const char kFormHtml[] =
     "<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
     "  <INPUT type=\"text\" id=\"firstname\"/>"
     "  <INPUT type=\"text\" id=\"lastname\"/>"
     "  <INPUT type=\"hidden\" id=\"imhidden\"/>"
     "  <INPUT type=\"text\" id=\"notempty\" value=\"Hi\"/>"
     "  <INPUT type=\"text\" autocomplete=\"off\" id=\"noautocomplete\"/>"
     "  <INPUT type=\"text\" disabled=\"disabled\" id=\"notenabled\"/>"
     "  <INPUT type=\"text\" readonly id=\"readonly\"/>"
     "  <INPUT type=\"text\" style=\"visibility: hidden\""
     "         id=\"invisible\"/>"
     "  <INPUT type=\"text\" style=\"display: none\" id=\"displaynone\"/>"
     "  <INPUT type=\"month\" id=\"month\"/>"
     "  <INPUT type=\"month\" id=\"month-nonempty\" value=\"2011-12\"/>"
     "  <SELECT id=\"select\">"
     "    <OPTION></OPTION>"
     "    <OPTION value=\"CA\">California</OPTION>"
     "    <OPTION value=\"TX\">Texas</OPTION>"
     "  </SELECT>"
     "  <SELECT id=\"select-nonempty\">"
     "    <OPTION value=\"CA\" selected>California</OPTION>"
     "    <OPTION value=\"TX\">Texas</OPTION>"
     "  </SELECT>"
+    "  <SELECT id=\"select-nonewsuggestion\">"

[Ilya Sherman, 2014/06/03 20:39:31]

nit: Perhaps "select-unchanged"?

+    "    <OPTION value=\"CA\" selected>California</OPTION>"
+    "    <OPTION value=\"TX\">Texas</OPTION>"
+    "  </SELECT>"
     "  <TEXTAREA id=\"textarea\"></TEXTAREA>"
     "  <TEXTAREA id=\"textarea-nonempty\">Go&#10;away!</TEXTAREA>"
     "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
     "</FORM>";
 
 }  // namespace
 
 namespace autofill {
 
 class FormAutofillTest : public ChromeRenderViewTest {
@@ skipping 115 matching lines @@
       expected.form_control_type = field_cases[i].form_control_type;
       expected.max_length =
           expected.form_control_type == "text" ?
           WebInputElement::defaultMaxLength() : 0;
       expected.name = ASCIIToUTF16(field_cases[i].name);
       expected.value = ASCIIToUTF16(field_cases[i].initial_value);
       expected.autocomplete_attribute = field_cases[i].autocomplete_attribute;
       EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[i]);
       // Fill the form_data for the field.
       form_data.fields[i].value = ASCIIToUTF16(field_cases[i].autofill_value);
+      // Set the is_autofilled property for the field.
+      form_data.fields[i].is_autofilled = field_cases[i].is_autofilled;
     }
 
     // Autofill the form using the given fill form function.
     fill_form_function(form_data, input_element);
 
     // Validate Autofill or Preview results.
     for (size_t i = 0; i < number_of_field_cases; ++i) {
       ValidteFilledField(field_cases[i], get_value_function);
     }
   }
@@ skipping 1089 matching lines @@
   expected.value = ASCIIToUTF16("123 Fantasy Ln.\nApt. 42");
   expected.form_control_type = "textarea";
   expected.max_length = 0;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, field);
 }
 
 // Test regular FillForm function.
 TEST_F(FormAutofillTest, FillForm) {
   static const AutofillFieldCase field_cases[] = {
-      // fields: form_control_type, name, initial_value, autocomplete_attribute,
-      //         should_be_autofilled, autofill_value, expected_value
+      // fields: form_control_type, name, initial_value,
+      //         autocomplete_attribute, is_autofilled, should_be_autofilled,
+      //         autofill_value, expected_value
 
       // Regular empty fields (firstname & lastname) should be autofilled.
-      {"text", "firstname", "", "", true, "filled firstname",
+      {"text", "firstname", "", "", true, true, "filled firstname",
        "filled firstname"},
-      {"text", "lastname", "", "", true, "filled lastname", "filled lastname"},
+      {"text", "lastname", "", "", true, true, "filled lastname",
+       "filled lastname"},
       // hidden fields should not be extracted to form_data.
       // Non empty fields should not be autofilled.
-      {"text", "notempty", "Hi", "", false, "filled notempty", "Hi"},
+      {"text", "notempty", "Hi", "", false, false, "filled notempty", "Hi"},
       // "noautocomplete" should not be extracted to form_data.
       // Disabled fields should not be autofilled.
-      {"text", "notenabled", "", "", false, "filled notenabled", ""},
+      {"text", "notenabled", "", "", false, false, "filled notenabled", ""},
       // Readonly fields should not be autofilled.
-      {"text", "readonly", "", "", false, "filled readonly", ""},
+      {"text", "readonly", "", "", false, false, "filled readonly", ""},
       // Fields with "visibility: hidden" should not be autofilled.
-      {"text", "invisible", "", "", false, "filled invisible", ""},
+      {"text", "invisible", "", "", false, false, "filled invisible", ""},
       // Fields with "display:none" should not be autofilled.
-      {"text", "displaynone", "", "", false, "filled displaynone", ""},
+      {"text", "displaynone", "", "", false, false, "filled displaynone", ""},
       // Regular <input type="month"> should be autofilled.
-      {"month", "month", "", "", true, "2017-11", "2017-11"},
+      {"month", "month", "", "", true, true, "2017-11", "2017-11"},
       // Non-empty <input type="month"> should not be autofilled.
-      {"month", "month-nonempty", "2011-12", "", false, "2017-11", "2011-12"},
+      {"month", "month-nonempty", "2011-12", "", false, false, "2017-11",
+       "2011-12"},
       // Regular select fields should be autofilled.
-      {"select-one", "select", "", "", true, "TX", "TX"},
+      {"select-one", "select", "", "", true, true, "TX", "TX"},
       // Select fields should be autofilled even if they already have a
       // non-empty value.
-      {"select-one", "select-nonempty", "CA", "", true, "TX", "TX"},
+      {"select-one", "select-nonempty", "CA", "", true, true, "TX", "TX"},
+      // Select fields should not be autofilled if no new value is passed from
+      // autofill profile. The existing value should not be overriden.
+      {"select-one", "select-nonewsuggestion", "CA", "", false, false, "CA",
+       "CA"},
       // Regular textarea elements should be autofilled.
-      {"textarea", "textarea", "", "", true, "some multi-\nline value",
+      {"textarea", "textarea", "", "", true, true, "some multi-\nline value",
        "some multi-\nline value"},
       // Non-empty textarea elements should not be autofilled.
-      {"textarea", "textarea-nonempty", "Go\naway!", "", false,
+      {"textarea", "textarea-nonempty", "Go\naway!", "", false, false,
        "some multi-\nline value", "Go\naway!"},
   };
   TestFormFillFunctions(kFormHtml, field_cases, arraysize(field_cases),
                         FillForm, &GetValueWrapper);
   // Verify preview selection.
   WebInputElement firstname = GetMainFrame()->document().
       getElementById("firstname").to<WebInputElement>();
   EXPECT_EQ(16, firstname.selectionStart());
   EXPECT_EQ(16, firstname.selectionEnd());
 }
 
 TEST_F(FormAutofillTest, FillFormIncludingNonFocusableElements) {
   static const AutofillFieldCase field_cases[] = {
-      // fields: form_control_type, name, initial_value, autocomplete_attribute,
-      //         should_be_autofilled, autofill_value, expected_value
+      // fields: form_control_type, name, initial_value,
+      //         autocomplete_attribute, is_autofilled, should_be_autofilled,
+      //         autofill_value, expected_value
 
       // Regular empty fields (firstname & lastname) should be autofilled.
-      {"text", "firstname", "", "", true, "filled firstname",
+      {"text", "firstname", "", "", true, true, "filled firstname",
        "filled firstname"},
-      {"text", "lastname", "", "", true, "filled lastname", "filled lastname"},
+      {"text", "lastname", "", "", true, true, "filled lastname",
+       "filled lastname"},
       // hidden fields should not be extracted to form_data.
       // Non empty fields should be overriden.
-      {"text", "notempty", "Hi", "", true, "filled notempty",
+      {"text", "notempty", "Hi", "", true, true, "filled notempty",
        "filled notempty"},
       // "noautocomplete" should not be extracted to form_data.
       // Disabled fields should not be autofilled.
-      {"text", "notenabled", "", "", false, "filled notenabled", ""},
+      {"text", "notenabled", "", "", false, false, "filled notenabled", ""},
       // Readonly fields should not be autofilled.
-      {"text", "readonly", "", "", false, "filled readonly", ""},
+      {"text", "readonly", "", "", false, false, "filled readonly", ""},
       // Fields with "visibility: hidden" should also be autofilled.
-      {"text", "invisible", "", "", true, "filled invisible",
+      {"text", "invisible", "", "", true, true, "filled invisible",
        "filled invisible"},
       // Fields with "display:none" should also be autofilled.
-      {"text", "displaynone", "", "", true, "filled displaynone",
+      {"text", "displaynone", "", "", true, true, "filled displaynone",
        "filled displaynone"},
       // Regular <input type="month"> should be autofilled.
-      {"month", "month", "", "", true, "2017-11", "2017-11"},
+      {"month", "month", "", "", true, true, "2017-11", "2017-11"},
       // Non-empty <input type="month"> should be overridden.
-      {"month", "month-nonempty", "2011-12", "", true, "2017-11", "2017-11"},
+      {"month", "month-nonempty", "2011-12", "", true, true, "2017-11",
+       "2017-11"},
       // Regular select fields should be autofilled.
-      {"select-one", "select", "", "", true, "TX", "TX"},
+      {"select-one", "select", "", "", true, true, "TX", "TX"},
       // Select fields should be autofilled even if they already have a
       // non-empty value.
-      {"select-one", "select-nonempty", "CA", "", true, "TX", "TX"},
+      {"select-one", "select-nonempty", "CA", "", true, true, "TX", "TX"},
+      // Select fields should not be autofilled if no new value is passed from
+      // autofill profile. The existing value should not be overriden.
+      {"select-one", "select-nonewsuggestion", "CA", "", false, false, "CA",
+       "CA"},
       // Regular textarea elements should be autofilled.
-      {"textarea", "textarea", "", "", true, "some multi-\nline value",
+      {"textarea", "textarea", "", "", true, true, "some multi-\nline value",
        "some multi-\nline value"},
       // Nonempty textarea elements should be overridden.
-      {"textarea", "textarea-nonempty", "Go\naway!", "", true,
+      {"textarea", "textarea-nonempty", "Go\naway!", "", true, true,
        "some multi-\nline value", "some multi-\nline value"},
   };
   TestFormFillFunctions(kFormHtml, field_cases, arraysize(field_cases),
                         &FillFormIncludingNonFocusableElementsWrapper,
                         &GetValueWrapper);
 }
 
 TEST_F(FormAutofillTest, PreviewForm) {
   static const AutofillFieldCase field_cases[] = {
       // Normal empty fields should be previewed.
-      {"text", "firstname", "", "", true, "suggested firstname",
+      {"text", "firstname", "", "", true, true, "suggested firstname",
        "suggested firstname"},
-      {"text", "lastname", "", "", true, "suggested lastname",
+      {"text", "lastname", "", "", true, true, "suggested lastname",
        "suggested lastname"},
       // Hidden fields should not be extracted to form_data.
       // Non empty fields should not be previewed.
-      {"text", "notempty", "Hi", "", false, "suggested notempty", ""},
+      {"text", "notempty", "Hi", "", false, false, "suggested notempty", ""},
       // "noautocomplete" should not be extracted to form_data.
       // Disabled fields should not be previewed.
-      {"text", "notenabled", "", "", false, "suggested notenabled", ""},
+      {"text", "notenabled", "", "", false, false, "suggested notenabled", ""},
       // Readonly fields should not be previewed.
-      {"text", "readonly", "", "", false, "suggested readonly", ""},
+      {"text", "readonly", "", "", false, false, "suggested readonly", ""},
       // Fields with "visibility: hidden" should not be previewed.
-      {"text", "invisible", "", "", false, "suggested invisible",
+      {"text", "invisible", "", "", false, false, "suggested invisible",
        ""},
       // Fields with "display:none" should not previewed.
-      {"text", "displaynone", "", "", false, "suggested displaynone",
+      {"text", "displaynone", "", "", false, false, "suggested displaynone",
        ""},
       // Regular <input type="month"> should be previewed.
-      {"month", "month", "", "", true, "2017-11", "2017-11"},
+      {"month", "month", "", "", true, true, "2017-11", "2017-11"},
       // Non-empty <input type="month"> should not be previewed.
-      {"month", "month-nonempty", "2011-12", "", false, "2017-11", ""},
+      {"month", "month-nonempty", "2011-12", "", false, false, "2017-11", ""},
       // Regular select fields should be previewed.
-      {"select-one", "select", "", "", true, "TX", "TX"},
+      {"select-one", "select", "", "", true, true, "TX", "TX"},
       // Select fields should be previewed even if they already have a
       // non-empty value.
-      {"select-one", "select-nonempty", "CA", "", true, "TX", "TX"},
+      {"select-one", "select-nonempty", "CA", "", true, true, "TX", "TX"},
+      // Select fields should not be previewed if no suggestion is passed from
+      // autofill profile.
+      {"select-one", "select-nonewsuggestion", "CA", "", false, false, "",
+       ""},
       // Normal textarea elements should be previewed.
-      {"textarea", "textarea", "", "", true, "suggested multi-\nline value",
-       "suggested multi-\nline value"},
+      {"textarea", "textarea", "", "", true, true,
+       "suggested multi-\nline value", "suggested multi-\nline value"},
       // Nonempty textarea elements should not be previewed.
-      {"textarea", "textarea-nonempty", "Go\naway!", "", false,
+      {"textarea", "textarea-nonempty", "Go\naway!", "", false, false,
        "suggested multi-\nline value", ""},
   };
   TestFormFillFunctions(kFormHtml, field_cases, arraysize(field_cases),
                         &PreviewForm, &GetSuggestedValueWrapper);
 
   // Verify preview selection.
   WebInputElement firstname = GetMainFrame()->document().
       getElementById("firstname").to<WebInputElement>();
   EXPECT_EQ(0, firstname.selectionStart());
   EXPECT_EQ(19, firstname.selectionEnd());
@@ skipping 908 matching lines @@
 
   expected.name = ASCIIToUTF16("email");
   expected.max_length = 9;
   expected.is_autofilled = false;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
 
   // Fill the form.
   form.fields[0].value = ASCIIToUTF16("Brother");
   form.fields[1].value = ASCIIToUTF16("Jonathan");
   form.fields[2].value = ASCIIToUTF16("brotherj@example.com");
+  form.fields[0].is_autofilled = true;
+  form.fields[1].is_autofilled = true;
+  form.fields[2].is_autofilled = true;
   FillForm(form, input_element);
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   FormFieldData field2;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
                                                     &form2,
                                                     &field2,
                                                     autofill::REQUIRE_NONE));
 
@@ skipping 246 matching lines @@
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]);
 
   expected.name = ASCIIToUTF16("cantelope");
   expected.is_autofilled = false;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
 
   // Fill the form.
   form.fields[0].value = ASCIIToUTF16("Red");
   form.fields[1].value = ASCIIToUTF16("Yellow");
   form.fields[2].value = ASCIIToUTF16("Also Yellow");
+  form.fields[0].is_autofilled = true;
+  form.fields[1].is_autofilled = true;
+  form.fields[2].is_autofilled = true;
   FillForm(form, input_element);
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   FormFieldData field2;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
                                                     &form2,
                                                     &field2,
                                                     autofill::REQUIRE_NONE));
 
@@ skipping 206 matching lines @@
 
   expected.name = ASCIIToUTF16("email");
   expected.value = base::string16();
   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;
   PreviewForm(form, input_element);
   EXPECT_EQ(2, input_element.selectionStart());
   EXPECT_EQ(5, input_element.selectionEnd());
 
   // Fill the form.
   FillForm(form, input_element);
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   FormFieldData field2;
@@ skipping 591 matching lines @@
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]);
 
   expected.name = ASCIIToUTF16("country");
   expected.value = ASCIIToUTF16("AL");
   expected.form_control_type = "select-one";
   expected.max_length = 0;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
 }
 
 }  // namespace autofill