Remove --respect-autocomplete-off-autofill flag.

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/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 247 matching lines @@
     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");
 
     // Find the form that contains the input element.
     FormData form_data;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form_data, &field, REQUIRE_NONE));
+    EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element, &form_data,
+                                                      &field));
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form_data.name);
       EXPECT_EQ(GURL("http://buh.com"), form_data.action);
     }
 
     const std::vector<FormFieldData>& fields = form_data.fields;
     ASSERT_EQ(number_of_field_cases, fields.size());
 
     FormFieldData expected;
     // Verify field's initial value.
@@ skipping 209 matching lines @@
     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");
 
     // Find the form and verify it's the correct form.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(4U, fields.size());
 
     FormFieldData expected;
@@ skipping 11 matching lines @@
 
     expected.name = ASCIIToUTF16("email");
     expected.value = ASCIIToUTF16("john@example.com");
     expected.autocomplete_attribute = "off";
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
     expected.autocomplete_attribute.clear();
 
     expected.name = ASCIIToUTF16("phone");
     expected.value = ASCIIToUTF16("1.800.555.1234");
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[3]);
-
-    // Try again, but require autocomplete.
-    FormData form2;
-    FormFieldData field2;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form2, &field2, REQUIRE_AUTOCOMPLETE));
-    EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
-    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.form_control_type = "text";
-    expected.max_length = WebInputElement::defaultMaxLength();
-
-    expected.name = ASCIIToUTF16("firstname");
-    expected.value = ASCIIToUTF16("John");
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, field);
-
-    expected.name = ASCIIToUTF16("lastname");
-    expected.value = ASCIIToUTF16("Smith");
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
-
-    expected.name = ASCIIToUTF16("phone");
-    expected.value = ASCIIToUTF16("1.800.555.1234");
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
   }
 
   void TestFindFormForTextAreaElement(const char* html, bool unowned) {
     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 textarea element we want to find.
     WebElement element = web_frame->document().getElementById("street-address");
     WebTextAreaElement textarea_element = element.to<WebTextAreaElement>();
 
     // Find the form and verify it's the correct form.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        textarea_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(textarea_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(4U, fields.size());
 
     FormFieldData expected;
@@ skipping 17 matching lines @@
     expected.max_length = WebInputElement::defaultMaxLength();
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
     expected.autocomplete_attribute.clear();
 
     expected.name = ASCIIToUTF16("street-address");
     expected.value = ASCIIToUTF16("123 Fantasy Ln.\nApt. 42");
     expected.form_control_type = "textarea";
     expected.max_length = 0;
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[3]);
     EXPECT_FORM_FIELD_DATA_EQUALS(expected, field);
-
-    // Try again, but require autocomplete.
-    FormData form2;
-    FormFieldData field2;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        textarea_element, &form2, &field2, REQUIRE_AUTOCOMPLETE));
-    EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
-    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("John");
-    expected.form_control_type = "text";
-    expected.max_length = WebInputElement::defaultMaxLength();
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
-
-    expected.name = ASCIIToUTF16("lastname");
-    expected.value = ASCIIToUTF16("Smith");
-    expected.form_control_type = "text";
-    expected.max_length = WebInputElement::defaultMaxLength();
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
-
-    expected.name = ASCIIToUTF16("street-address");
-    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);
   }
 
   void TestFillFormMaxLength(const char* html, bool unowned) {
     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");
 
     // Find the form that contains the input element.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(3U, fields.size());
 
     FormFieldData expected;
@@ skipping 19 matching lines @@
     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, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form2, &field2));
     EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
     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.form_control_type = "text";
@@ skipping 25 matching lines @@
     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");
 
     // Find the form that contains the input element.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(3U, fields.size());
 
     FormFieldData expected;
@@ skipping 11 matching lines @@
 
     // Fill the form.
     form.fields[0].value = ASCIIToUTF16("Brother");
     form.fields[1].value = ASCIIToUTF16("Jonathan");
     form.fields[2].value = ASCIIToUTF16("brotherj@example.com");
     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, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form2, &field2));
     EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
     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");
@@ skipping 17 matching lines @@
     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");
 
     // Find the form that contains the input element.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(3U, fields.size());
 
     FormFieldData expected;
@@ skipping 11 matching lines @@
 
     // Fill the form.
     form.fields[0].value = ASCIIToUTF16("Wyatt");
     form.fields[1].value = ASCIIToUTF16("Earp");
     form.fields[2].value = ASCIIToUTF16("wyatt@example.com");
     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, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form2, &field2));
     EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
     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.form_control_type = "text";
@@ skipping 21 matching lines @@
     std::vector<FormData> forms = form_cache.ExtractNewForms();
     const size_t expected_size = unowned ? 1 : 2;
     ASSERT_EQ(expected_size, forms.size());
 
     // Get the input element we want to find.
     WebInputElement input_element = GetInputElementById("apple");
 
     // Find the form that contains the input element.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_TRUE(form.name.empty());
       EXPECT_EQ(GURL("http://abc.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     const size_t unowned_offset = unowned ? 3 : 0;
     ASSERT_EQ(unowned_offset + 3, fields.size());
 
@@ skipping 18 matching lines @@
     form.fields[unowned_offset + 1].value = ASCIIToUTF16("Yellow");
     form.fields[unowned_offset + 2].value = ASCIIToUTF16("Also Yellow");
     form.fields[unowned_offset + 0].is_autofilled = true;
     form.fields[unowned_offset + 1].is_autofilled = true;
     form.fields[unowned_offset + 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, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form2, &field2));
     EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
     if (!unowned) {
       EXPECT_TRUE(form2.name.empty());
       EXPECT_EQ(GURL("http://abc.com"), form2.action);
     }
 
     const std::vector<FormFieldData>& fields2 = form2.fields;
     ASSERT_EQ(unowned_offset + 3, fields2.size());
 
     expected.name = ASCIIToUTF16("apple");
@@ skipping 23 matching lines @@
 
     // Get the input element we want to find.
     WebInputElement input_element = GetInputElementById("firstname");
 
     // Simulate typing by modifying the field value.
     input_element.setValue(ASCIIToUTF16("Wy"));
 
     // Find the form that contains the input element.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(3U, fields.size());
 
     FormFieldData expected;
@@ skipping 25 matching lines @@
     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;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        input_element, &form2, &field2, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(input_element, &form2, &field2));
     EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
     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");
@@ skipping 41 matching lines @@
 
     // Clear the form.
     EXPECT_TRUE(form_cache.ClearFormWithElement(firstname));
 
     // Verify that the auto-filled attribute has been turned off.
     EXPECT_FALSE(firstname.isAutofilled());
 
     // Verify the form is cleared.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        firstname, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(firstname, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(9U, fields.size());
 
     FormFieldData expected;
@@ skipping 72 matching lines @@
 
     // Clear the form.
     EXPECT_TRUE(form_cache.ClearFormWithElement(firstname));
 
     // Verify that the auto-filled attribute has been turned off.
     EXPECT_FALSE(firstname.isAutofilled());
 
     // Verify the form is cleared.
     FormData form;
     FormFieldData field;
-    EXPECT_TRUE(FindFormAndFieldForFormControlElement(
-        firstname, &form, &field, REQUIRE_NONE));
+    EXPECT_TRUE(
+        FindFormAndFieldForFormControlElement(firstname, &form, &field));
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
       EXPECT_EQ(GURL("http://buh.com"), form.action);
     }
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(3U, fields.size());
 
     FormFieldData expected;
@@ skipping 763 matching lines @@
   WebVector<WebFormElement> forms;
   frame->document().forms(forms);
   ASSERT_EQ(1U, forms.size());
 
   WebInputElement input_element = GetInputElementById("firstname");
 
   FormData form;
   FormFieldData field;
   EXPECT_TRUE(WebFormElementToFormData(forms[0],
                                        input_element,
-                                       REQUIRE_NONE,
                                        EXTRACT_VALUE,
                                        &form,
                                        &field));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(frame->document().url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormFieldData>& fields = form.fields;
   ASSERT_EQ(6U, fields.size());
 
@@ skipping 57 matching lines @@
   WebVector<WebFormElement> forms;
   frame->document().forms(forms);
   ASSERT_EQ(1U, forms.size());
 
   WebInputElement input_element = GetInputElementById("firstname");
 
   FormData form;
   FormFieldData field;
   EXPECT_FALSE(WebFormElementToFormData(forms[0],
                                         input_element,
-                                        REQUIRE_NONE,
                                         EXTRACT_VALUE,
                                         &form,
                                         &field));
 }
 
 TEST_F(FormAutofillTest, ExtractForms) {
   ExpectJohnSmithLabels(
       "<FORM name='TestForm' action='http://cnn.com' method='post'>"
       "  First name: <INPUT type='text' id='firstname' value='John'/>"
       "  Last name: <INPUT type='text' id='lastname' value='Smith'/>"
@@ skipping 229 matching lines @@
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(nullptr, web_frame);
 
   FormCache form_cache(*web_frame);
   std::vector<FormData> forms = form_cache.ExtractNewForms();
   ASSERT_TRUE(forms.empty());
 }
 
 TEST_F(FormAutofillTest, WebFormElementToFormDataAutocomplete) {
   {
-    // Form is not auto-completable due to autocomplete=off.
+    // Form is still Autofill-able despite autocomplete=off.
     LoadHTML("<FORM name='TestForm' action='http://cnn.com' method='post'"
              " autocomplete=off>"
              "  <INPUT type='text' id='firstname' value='John'/>"
              "  <INPUT type='text' id='lastname' value='Smith'/>"
              "  <INPUT type='text' id='email' value='john@example.com'/>"
              "  <INPUT type='submit' name='reply-send' value='Send'/>"
              "</FORM>");
 
     WebFrame* web_frame = GetMainFrame();
     ASSERT_NE(nullptr, web_frame);
 
     WebVector<WebFormElement> web_forms;
     web_frame->document().forms(web_forms);
     ASSERT_EQ(1U, web_forms.size());
     WebFormElement web_form = web_forms[0];
 
     FormData form;
-    EXPECT_TRUE(WebFormElementToFormData(
-        web_form, WebFormControlElement(), REQUIRE_NONE, EXTRACT_NONE, &form,
-        nullptr));
-    EXPECT_FALSE(WebFormElementToFormData(
-        web_form, WebFormControlElement(), REQUIRE_AUTOCOMPLETE, EXTRACT_NONE,
-        &form, nullptr));
-  }
-
-  {
-    // The firstname element is not auto-completable due to autocomplete=off.
-    LoadHTML("<FORM name='TestForm' action='http://abc.com' "
-             "      method='post'>"
-             "  <INPUT type='text' id='firstname' value='John'"
-             "   autocomplete=off>"
-             "  <INPUT type='text' id='middlename' value='Jack'/>"
-             "  <INPUT type='text' id='lastname' value='Smith'/>"
-             "  <INPUT type='text' id='email' value='john@example.com'/>"
-             "  <INPUT type='submit' name='reply' value='Send'/>"
-             "</FORM>");
-
-    WebFrame* web_frame = GetMainFrame();
-    ASSERT_NE(nullptr, web_frame);
-
-    WebVector<WebFormElement> web_forms;
-    web_frame->document().forms(web_forms);
-    ASSERT_EQ(1U, web_forms.size());
-    WebFormElement web_form = web_forms[0];
-
-    FormData form;
-    EXPECT_TRUE(WebFormElementToFormData(
-        web_form, WebFormControlElement(), REQUIRE_AUTOCOMPLETE, EXTRACT_VALUE,
-        &form, nullptr));
-
-    EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
-    EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
-    EXPECT_EQ(GURL("http://abc.com"), form.action);
-
-    const std::vector<FormFieldData>& fields = form.fields;
-    ASSERT_EQ(3U, fields.size());
-
-    FormFieldData expected;
-    expected.form_control_type = "text";
-    expected.max_length = WebInputElement::defaultMaxLength();
-
-    expected.name = ASCIIToUTF16("middlename");
-    expected.value = ASCIIToUTF16("Jack");
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[0]);
-
-    expected.name = ASCIIToUTF16("lastname");
-    expected.value = ASCIIToUTF16("Smith");
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]);
-
-    expected.name = ASCIIToUTF16("email");
-    expected.value = ASCIIToUTF16("john@example.com");
-    EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
+    EXPECT_TRUE(WebFormElementToFormData(web_form, WebFormControlElement(),
+                                         EXTRACT_NONE, &form, nullptr));
   }
 }
 
 TEST_F(FormAutofillTest, FindFormForInputElement) {
   TestFindFormForInputElement(
       "<FORM name='TestForm' action='http://buh.com' method='post'>"
       "  <INPUT type='text' id='firstname' value='John'/>"
       "  <INPUT type='text' id='lastname' value='Smith'/>"
       "  <INPUT type='text' id='email' value='john@example.com'"
       "autocomplete='off' />"
@@ skipping 1195 matching lines @@
   WebFrame* frame = GetMainFrame();
   ASSERT_NE(nullptr, frame);
 
   WebVector<WebFormElement> forms;
   frame->document().forms(forms);
   ASSERT_EQ(1U, forms.size());
 
   FormData form;
   EXPECT_TRUE(WebFormElementToFormData(forms[0],
                                        WebFormControlElement(),
-                                       REQUIRE_NONE,
                                        EXTRACT_VALUE,
                                        &form,
                                        nullptr));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(frame->document().url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormFieldData>& fields = form.fields;
   ASSERT_EQ(4U, fields.size());
 
@@ skipping 38 matching lines @@
   WebFrame* frame = GetMainFrame();
   ASSERT_NE(nullptr, frame);
 
   WebVector<WebFormElement> forms;
   frame->document().forms(forms);
   ASSERT_EQ(1U, forms.size());
 
   FormData form;
   EXPECT_TRUE(WebFormElementToFormData(forms[0],
                                        WebFormControlElement(),
-                                       REQUIRE_NONE,
                                        EXTRACT_VALUE,
                                        &form,
                                        nullptr));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(frame->document().url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormFieldData>& fields = form.fields;
   ASSERT_EQ(6U, fields.size());
 
@@ skipping 292 matching lines @@
   select_element.setValue(WebString::fromUTF8("AL"));
 
   WebVector<WebFormElement> forms;
   frame->document().forms(forms);
   ASSERT_EQ(1U, forms.size());
 
   FormData form;
 
   // Extract the country select-one value as text.
   EXPECT_TRUE(WebFormElementToFormData(
-      forms[0], WebFormControlElement(), REQUIRE_NONE,
-      static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTION_TEXT),
-      &form, nullptr));
+      forms[0], WebFormControlElement(),
+      static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTION_TEXT), &form,
+      nullptr));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(frame->document().url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormFieldData>& fields = form.fields;
   ASSERT_EQ(3U, fields.size());
 
   FormFieldData expected;
 
   expected.name = ASCIIToUTF16("firstname");
@@ skipping 11 matching lines @@
   expected.name = ASCIIToUTF16("country");
   expected.value = ASCIIToUTF16("Albania");
   expected.form_control_type = "select-one";
   expected.max_length = 0;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
 
   form.fields.clear();
   // Extract the country select-one value as value.
   EXPECT_TRUE(WebFormElementToFormData(forms[0],
                                        WebFormControlElement(),
-                                       REQUIRE_NONE,
                                        EXTRACT_VALUE,
                                        &form,
                                        nullptr));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(frame->document().url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   ASSERT_EQ(3U, fields.size());
 
   expected.name = ASCIIToUTF16("firstname");
@@ skipping 40 matching lines @@
   WebFrame* frame = GetMainFrame();
   ASSERT_NE(nullptr, frame);
 
   control_elements = GetUnownedAutofillableFormFieldElements(
       frame->document().all(), &fieldsets);
   ASSERT_EQ(3U, control_elements.size());
   ASSERT_EQ(2U, fieldsets.size());
 
   FormData form;
   EXPECT_TRUE(UnownedFormElementsAndFieldSetsToFormData(
-      fieldsets, control_elements, nullptr, dummy_origin, REQUIRE_NONE,
-      extract_mask, &form, nullptr));
+      fieldsets, control_elements, nullptr, dummy_origin, extract_mask, &form,
+      nullptr));
 
   EXPECT_TRUE(form.name.empty());
   EXPECT_EQ(dummy_origin, form.origin);
   EXPECT_FALSE(form.action.is_valid());
 
   const std::vector<FormFieldData>& fields = form.fields;
   ASSERT_EQ(3U, fields.size());
 
   FormFieldData expected;
   expected.form_control_type = "text";
@@ skipping 38 matching lines @@
   WebFrame* frame = GetMainFrame();
   ASSERT_NE(nullptr, frame);
 
   control_elements = GetUnownedAutofillableFormFieldElements(
       frame->document().all(), &fieldsets);
   ASSERT_EQ(3U, control_elements.size());
   ASSERT_EQ(1U, fieldsets.size());
 
   FormData form;
   EXPECT_TRUE(UnownedFormElementsAndFieldSetsToFormData(
-      fieldsets, control_elements, nullptr, dummy_origin, REQUIRE_NONE,
-      extract_mask, &form, nullptr));
+      fieldsets, control_elements, nullptr, dummy_origin, extract_mask, &form,
+      nullptr));
 
   EXPECT_TRUE(form.name.empty());
   EXPECT_EQ(dummy_origin, form.origin);
   EXPECT_FALSE(form.action.is_valid());
 
   const std::vector<FormFieldData>& fields = form.fields;
   ASSERT_EQ(3U, fields.size());
 
   FormFieldData expected;
   expected.form_control_type = "text";
@@ skipping 28 matching lines @@
   WebFrame* frame = GetMainFrame();
   ASSERT_NE(nullptr, frame);
 
   control_elements = GetUnownedAutofillableFormFieldElements(
       frame->document().all(), &fieldsets);
   ASSERT_TRUE(control_elements.empty());
   ASSERT_TRUE(fieldsets.empty());
 
   FormData form;
   EXPECT_FALSE(UnownedFormElementsAndFieldSetsToFormData(
-      fieldsets, control_elements, nullptr, dummy_origin, REQUIRE_NONE,
-      extract_mask, &form, nullptr));
+      fieldsets, control_elements, nullptr, dummy_origin, extract_mask, &form,
+      nullptr));
 }
 
 }  // namespace autofill