Revert of Exclude readonly and disabled elements from autofill form.

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 1437 matching lines @@
       //         should_be_autofilled, autofill_value, expected_value
 
       // Regular empty fields (firstname & lastname) should be autofilled.
       {"text", "firstname", "", "", true, "filled firstname",
        "filled firstname"},
       {"text", "lastname", "", "", 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"},
       // "noautocomplete" should not be extracted to form_data.
-      // Disabled fields should not be extracted to form_data.
-      // Readonly fields should not be extracted to form_data.
+      // Disabled fields should not be autofilled.
+      {"text", "notenabled", "", "", false, "filled notenabled", ""},
+      // Readonly fields should not be autofilled.
+      {"text", "readonly", "", "", false, "filled readonly", ""},
       // Fields with "visibility: hidden" should not be autofilled.
       {"text", "invisible", "", "", false, "filled invisible", ""},
       // Fields with "display:none" should not be autofilled.
       {"text", "displaynone", "", "", false, "filled displaynone", ""},
       // Regular <input type="month"> should be autofilled.
       {"month", "month", "", "", true, "2017-11", "2017-11"},
       // Non-empty <input type="month"> should not be autofilled.
       {"month", "month-nonempty", "2011-12", "", false, "2017-11", "2011-12"},
       // Regular select fields should be autofilled.
       {"select-one", "select", "", "", true, "TX", "TX"},
@@ skipping 26 matching lines @@
 
       // Regular empty fields (firstname & lastname) should be autofilled.
       {"text", "firstname", "", "", true, "filled firstname",
        "filled firstname"},
       {"text", "lastname", "", "", 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",
        "filled notempty"},
       // "noautocomplete" should not be extracted to form_data.
-      // Disabled fields should not be extracted to form_data.
-      // Readonly fields should not be extracted to form_data.
+      // Disabled fields should not be autofilled.
+      {"text", "notenabled", "", "", false, "filled notenabled", ""},
+      // Readonly fields should not be autofilled.
+      {"text", "readonly", "", "", false, "filled readonly", ""},
       // Fields with "visibility: hidden" should also be autofilled.
       {"text", "invisible", "", "", true, "filled invisible",
        "filled invisible"},
       // Fields with "display:none" should also be autofilled.
       {"text", "displaynone", "", "", true, "filled displaynone",
        "filled displaynone"},
       // Regular <input type="month"> should be autofilled.
       {"month", "month", "", "", true, "2017-11", "2017-11"},
       // Non-empty <input type="month"> should be overridden.
       {"month", "month-nonempty", "2011-12", "", true, "2017-11", "2017-11"},
@@ skipping 21 matching lines @@
   static const AutofillFieldCase field_cases[] = {
       // Normal empty fields should be previewed.
       {"text", "firstname", "", "", true, "suggested firstname",
        "suggested firstname"},
       {"text", "lastname", "", "", 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", ""},
       // "noautocomplete" should not be extracted to form_data.
-      // Disabled fields should not be extracted to form_data.
-      // Readonly fields should not be extracted to form_data.
+      // Disabled fields should not be previewed.
+      {"text", "notenabled", "", "", false, "suggested notenabled", ""},
+      // Readonly fields should not be previewed.
+      {"text", "readonly", "", "", false, "suggested readonly", ""},
       // Fields with "visibility: hidden" should not be previewed.
       {"text", "invisible", "", "", false, "suggested invisible",
        ""},
       // Fields with "display:none" should not previewed.
       {"text", "displaynone", "", "", false, "suggested displaynone",
        ""},
       // Regular <input type="month"> should be previewed.
       {"month", "month", "", "", true, "2017-11", "2017-11"},
       // Non-empty <input type="month"> should not be previewed.
       {"month", "month-nonempty", "2011-12", "", false, "2017-11", ""},
@@ skipping 1537 matching lines @@
   FormFieldData field2;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(firstname,
                                                     &form2,
                                                     &field2,
                                                     autofill::REQUIRE_NONE));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
   const std::vector<FormFieldData>& fields2 = form2.fields;
-  ASSERT_EQ(6U, fields2.size());
+  ASSERT_EQ(9U, fields2.size());
 
   FormFieldData expected;
   expected.form_control_type = "text";
   expected.max_length = WebInputElement::defaultMaxLength();
 
   expected.name = ASCIIToUTF16("firstname");
   expected.value = base::string16();
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
 
   expected.name = ASCIIToUTF16("lastname");
   expected.value = base::string16();
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
 
   expected.name = ASCIIToUTF16("noAC");
   expected.value = ASCIIToUTF16("one");
   expected.autocomplete_attribute = "off";
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
   expected.autocomplete_attribute = std::string();  // reset
 
+  expected.name = ASCIIToUTF16("notenabled");
+  expected.value = ASCIIToUTF16("no clear");
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[3]);
+
   expected.form_control_type = "month";
   expected.max_length = 0;
   expected.name = ASCIIToUTF16("month");
   expected.value = base::string16();
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[3]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[4]);
+
+  expected.name = ASCIIToUTF16("month-disabled");
+  expected.value = ASCIIToUTF16("2012-11");
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[5]);
 
   expected.form_control_type = "textarea";
   expected.name = ASCIIToUTF16("textarea");
   expected.value = base::string16();
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[4]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[6]);
+
+  expected.name = ASCIIToUTF16("textarea-disabled");
+  expected.value = ASCIIToUTF16("    Banana!  ");
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[7]);
 
   expected.name = ASCIIToUTF16("textarea-noAC");
   expected.value = ASCIIToUTF16("Carrot?");
   expected.autocomplete_attribute = "off";
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[5]);
+  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[8]);
   expected.autocomplete_attribute = std::string();  // reset
 
   // Verify that the cursor position has been updated.
   EXPECT_EQ(0, firstname.selectionStart());
   EXPECT_EQ(0, firstname.selectionEnd());
 }
 
 TEST_F(FormAutofillTest, ClearFormWithNodeContainingSelectOne) {
   LoadHTML(
       "<FORM name='TestForm' action='http://buh.com' method='post'>"
@@ skipping 503 matching lines @@
   expected.max_length = WebInputElement::defaultMaxLength();
   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