Revert of [Autofill] Enable Autofill for dynamically created forms.

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 99 matching lines @@
     ASSERT_EQ(labels.size(), values.size());
     ASSERT_EQ(labels.size(), control_types.size());
 
     LoadHTML(html);
 
     WebFrame* web_frame = GetMainFrame();
     ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
     FormCache form_cache;
     std::vector<FormData> forms;
-    form_cache.ExtractNewForms(*web_frame, &forms);
+    form_cache.ExtractForms(*web_frame, &forms);
     ASSERT_EQ(1U, forms.size());
 
     const FormData& form = forms[0];
     EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
     EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
     EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
     const std::vector<FormFieldData>& fields = form.fields;
     ASSERT_EQ(labels.size(), fields.size());
     for (size_t i = 0; i < labels.size(); ++i) {
@@ skipping 39 matching lines @@
                              size_t number_of_field_cases,
                              FillFormFunction fill_form_function,
                              GetValueFunction get_value_function) {
     LoadHTML(html);
 
     WebFrame* web_frame = GetMainFrame();
     ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
     FormCache form_cache;
     std::vector<FormData> forms;
-    form_cache.ExtractNewForms(*web_frame, &forms);
+    form_cache.ExtractForms(*web_frame, &forms);
     ASSERT_EQ(1U, forms.size());
 
     // Get the input element we want to find.
     WebElement element = web_frame->document().getElementById("firstname");
     WebInputElement input_element = element.to<WebInputElement>();
 
     // Find the form that contains the input element.
     FormData form_data;
     FormFieldData field;
     EXPECT_TRUE(
@@ skipping 607 matching lines @@
            "  <INPUT type=\"text\" id=\"lastname\" value=\"Adams\"/>"
            "  <INPUT type=\"text\" id=\"email\" value=\"jack@example.com\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(2U, forms.size());
 
   // First form.
   const FormData& form = forms[0];
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(web_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());
@@ skipping 29 matching lines @@
 
   expected.name = ASCIIToUTF16("lastname");
   expected.value = ASCIIToUTF16("Adams");
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
 
   expected.name = ASCIIToUTF16("email");
   expected.value = ASCIIToUTF16("jack@example.com");
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
 }
 
-TEST_F(FormAutofillTest, OnlyExtractNewForms) {
-  LoadHTML(
-      "<FORM id='testform' action='http://cnn.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'/>"
-      "  <INPUT type='submit' name='reply-send' value='Send'/>"
-      "</FORM>");
-
-  WebFrame* web_frame = GetMainFrame();
-  ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
-
-  FormCache form_cache;
-  std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
-  ASSERT_EQ(1U, forms.size());
-  forms.clear();
-
-  // Second call should give nothing as there are no new forms.
-  form_cache.ExtractNewForms(*web_frame, &forms);
-  ASSERT_EQ(0U, forms.size());
-
-  // Append to the current form will re-extract.
-  ExecuteJavaScript(
-      "var newInput = document.createElement('input');"
-      "newInput.setAttribute('type', 'text');"
-      "newInput.setAttribute('id', 'telephone');"
-      "newInput.value = '12345';"
-      "document.getElementById('testform').appendChild(newInput);");
-  msg_loop_.RunUntilIdle();
-
-  form_cache.ExtractNewForms(*web_frame, &forms);
-  ASSERT_EQ(1U, forms.size());
-
-  const std::vector<FormFieldData>& fields = forms[0].fields;
-  ASSERT_EQ(4U, fields.size());
-
-  FormFieldData expected;
-  expected.form_control_type = "text";
-  expected.max_length = WebInputElement::defaultMaxLength();
-
-  expected.name = ASCIIToUTF16("firstname");
-  expected.value = ASCIIToUTF16("John");
-  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]);
-
-  expected.name = ASCIIToUTF16("telephone");
-  expected.value = ASCIIToUTF16("12345");
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[3]);
-
-  forms.clear();
-
-  // Completely new form will also be extracted.
-  ExecuteJavaScript(
-      "var newForm=document.createElement('form');"
-      "newForm.id='new_testform';"
-      "newForm.action='http://google.com';"
-      "newForm.method='post';"
-      "var newFirstname=document.createElement('input');"
-      "newFirstname.setAttribute('type', 'text');"
-      "newFirstname.setAttribute('id', 'second_firstname');"
-      "newFirstname.value = 'Bob';"
-      "var newLastname=document.createElement('input');"
-      "newLastname.setAttribute('type', 'text');"
-      "newLastname.setAttribute('id', 'second_lastname');"
-      "newLastname.value = 'Hope';"
-      "var newEmail=document.createElement('input');"
-      "newEmail.setAttribute('type', 'text');"
-      "newEmail.setAttribute('id', 'second_email');"
-      "newEmail.value = 'bobhope@example.com';"
-      "newForm.appendChild(newFirstname);"
-      "newForm.appendChild(newLastname);"
-      "newForm.appendChild(newEmail);"
-      "document.body.appendChild(newForm);");
-  msg_loop_.RunUntilIdle();
-
-  web_frame = GetMainFrame();
-  form_cache.ExtractNewForms(*web_frame, &forms);
-  ASSERT_EQ(1U, forms.size());
-
-  const std::vector<FormFieldData>& fields2 = forms[0].fields;
-  ASSERT_EQ(3U, fields2.size());
-
-  expected.name = ASCIIToUTF16("second_firstname");
-  expected.value = ASCIIToUTF16("Bob");
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
-
-  expected.name = ASCIIToUTF16("second_lastname");
-  expected.value = ASCIIToUTF16("Hope");
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
-
-  expected.name = ASCIIToUTF16("second_email");
-  expected.value = ASCIIToUTF16("bobhope@example.com");
-  EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
-}
-
 // We should not extract a form if it has too few fillable fields.
 TEST_F(FormAutofillTest, ExtractFormsTooFewFields) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>"
            "  <INPUT type=\"text\" id=\"lastname\" value=\"Smith\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   EXPECT_EQ(0U, forms.size());
 }
 
 // We should not report additional forms for empty forms.
 TEST_F(FormAutofillTest, ExtractFormsSkippedForms) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>"
            "  <INPUT type=\"text\" id=\"lastname\" value=\"Smith\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  bool has_skipped_forms = form_cache.ExtractFormsAndFormElements(*web_frame,
+                                                               3,
+                                                               &forms,
+                                                               NULL);
   EXPECT_EQ(0U, forms.size());
+  EXPECT_TRUE(has_skipped_forms);
 }
 
 // We should not report additional forms for empty forms.
 TEST_F(FormAutofillTest, ExtractFormsNoFields) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  bool has_skipped_forms = form_cache.ExtractFormsAndFormElements(*web_frame,
+                                                               3,
+                                                               &forms,
+                                                               NULL);
   EXPECT_EQ(0U, forms.size());
+  EXPECT_FALSE(has_skipped_forms);
 }
 
 // We should not extract a form if it has too few fillable fields.
 // Make sure radio and checkbox fields don't count.
 TEST_F(FormAutofillTest, ExtractFormsTooFewFieldsSkipsCheckable) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>"
            "  <INPUT type=\"text\" id=\"lastname\" value=\"Smith\"/>"
            "  <INPUT type=\"radio\" id=\"a_radio\" value=\"0\"/>"
            "  <INPUT type=\"checkbox\" id=\"a_check\" value=\"1\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   EXPECT_EQ(0U, forms.size());
 }
 
 TEST_F(FormAutofillTest, WebFormElementToFormDataAutocomplete) {
   {
     // Form is not auto-completable due to 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\"/>"
@@ skipping 76 matching lines @@
                      "autocomplete=\"off\" />"
            "  <INPUT type=\"text\" id=\"phone\" value=\"1.800.555.1234\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the form and verify it's the correct form.
   FormData form;
   FormFieldData field;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
@@ skipping 73 matching lines @@
                "Apt. 42"
              "</TEXTAREA>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   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,
@@ skipping 1076 matching lines @@
            "  <INPUT type=\"text\" id=\"lastname\" maxlength=\"7\"/>"
            "  <INPUT type=\"text\" id=\"email\" maxlength=\"9\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the form that contains the input element.
   FormData form;
   FormFieldData field;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
@@ skipping 76 matching lines @@
            "  <INPUT type=\"text\" id=\"lastname\" maxlength=\"-10\"/>"
            "  <INPUT type=\"text\" id=\"email\" maxlength=\"-13\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the form that contains the input element.
   FormData form;
   FormFieldData field;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
@@ skipping 60 matching lines @@
            "  <INPUT type=\"text\" id=\"lastname\"/>"
            "  <INPUT type=\"text\" id=\"email\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the form that contains the input element.
   FormData form;
   FormFieldData field;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
@@ skipping 69 matching lines @@
            "  <INPUT type=\"text\" id=\"banana\"/>"
            "  <INPUT type=\"text\" id=\"cantelope\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(2U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("apple");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the form that contains the input element.
   FormData form;
   FormFieldData field;
   EXPECT_TRUE(FindFormAndFieldForFormControlElement(input_element,
@@ skipping 199 matching lines @@
            "  <INPUT type=\"text\" id=\"lastname\"/>"
            "  <INPUT type=\"text\" id=\"email\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Simulate typing by modifying the field value.
   input_element.setValue(ASCIIToUTF16("Wy"));
 
   // Find the form that contains the input element.
@@ skipping 91 matching lines @@
       "  </TEXTAREA>"
       "  <TEXTAREA id=\"textarea-noAC\" autocomplete=\"off\">Carrot?</TEXTAREA>"
       "  <INPUT type=\"submit\" value=\"Send\"/>"
       "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Set the auto-filled attribute on the firstname element.
   WebInputElement firstname =
       web_frame->document().getElementById("firstname").to<WebInputElement>();
   firstname.setAutofilled(true);
 
   // Set the value of the disabled text input element.
   WebInputElement notenabled =
       web_frame->document().getElementById("notenabled").to<WebInputElement>();
@@ skipping 83 matching lines @@
       "    <OPTION>AK</OPTION>"
       "  </SELECT>"
       "  <INPUT type=\"submit\" value=\"Send\"/>"
       "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Set the auto-filled attribute on the firstname element.
   WebInputElement firstname =
       web_frame->document().getElementById("firstname").to<WebInputElement>();
   firstname.setAutofilled(true);
 
   // Set the value of the select-one.
   WebSelectElement select_element =
       web_frame->document().getElementById("state").to<WebSelectElement>();
@@ skipping 52 matching lines @@
            "  <INPUT type=\"email\" id=\"email2\"/>"
            "  <INPUT type=\"tel\" id=\"phone\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Set the auto-filled attribute.
   WebInputElement firstname =
       web_frame->document().getElementById("firstname").to<WebInputElement>();
   firstname.setAutofilled(true);
   WebInputElement lastname =
       web_frame->document().getElementById("lastname").to<WebInputElement>();
   lastname.setAutofilled(true);
   WebInputElement email =
@@ skipping 47 matching lines @@
            "  <INPUT type=\"email\" id=\"email2\"/>"
            "  <INPUT type=\"tel\" id=\"phone\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Set the auto-filled attribute.
   WebInputElement firstname =
       web_frame->document().getElementById("firstname").to<WebInputElement>();
   firstname.setAutofilled(true);
   WebInputElement lastname =
       web_frame->document().getElementById("lastname").to<WebInputElement>();
   lastname.setAutofilled(true);
   WebInputElement email =
@@ skipping 47 matching lines @@
            "  <INPUT type=\"email\" id=\"email2\"/>"
            "  <INPUT type=\"tel\" id=\"phone\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Set the auto-filled attribute.
   WebInputElement firstname =
       web_frame->document().getElementById("firstname").to<WebInputElement>();
   firstname.setAutofilled(true);
   WebInputElement lastname =
       web_frame->document().getElementById("lastname").to<WebInputElement>();
   lastname.setAutofilled(true);
   WebInputElement email =
@@ skipping 46 matching lines @@
            "  <INPUT type=\"email\" id=\"email2\"/>"
            "  <INPUT type=\"tel\" id=\"phone\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormCache form_cache;
   std::vector<FormData> forms;
-  form_cache.ExtractNewForms(*web_frame, &forms);
+  form_cache.ExtractForms(*web_frame, &forms);
   ASSERT_EQ(1U, forms.size());
 
   WebInputElement firstname =
       web_frame->document().getElementById("firstname").to<WebInputElement>();
 
   // Auto-filled attribute not set yet.
   EXPECT_FALSE(FormWithElementIsAutofilled(firstname));
 
   // Set the auto-filled attribute.
   firstname.setAutofilled(true);
@@ skipping 145 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