| Index: chrome/renderer/autofill/form_autofill_browsertest.cc
|
| diff --git a/chrome/renderer/autofill/form_autofill_browsertest.cc b/chrome/renderer/autofill/form_autofill_browsertest.cc
|
| index 99a7aed243d2a6bd8d77b5326bbbe76b14681f2d..35ab0f9e0516aba6b9ff6af07a1fe3097831c95d 100644
|
| --- a/chrome/renderer/autofill/form_autofill_browsertest.cc
|
| +++ b/chrome/renderer/autofill/form_autofill_browsertest.cc
|
| @@ -165,8 +165,8 @@ class FormAutofillTest : public ChromeRenderViewTest {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| const FormData& form = forms[0];
|
| @@ -224,8 +224,8 @@ class FormAutofillTest : public ChromeRenderViewTest {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -974,8 +974,8 @@ TEST_F(FormAutofillTest, ExtractMultipleForms) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(2U, forms.size());
|
|
|
| // First form.
|
| @@ -1037,12 +1037,12 @@ TEST_F(FormAutofillTest, OnlyExtractNewForms) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Second call should give nothing as there are no new forms.
|
| - forms = form_cache.ExtractNewForms(*web_frame);
|
| + forms = form_cache.ExtractNewForms();
|
| ASSERT_TRUE(forms.empty());
|
|
|
| // Append to the current form will re-extract.
|
| @@ -1054,7 +1054,7 @@ TEST_F(FormAutofillTest, OnlyExtractNewForms) {
|
| "document.getElementById('testform').appendChild(newInput);");
|
| msg_loop_.RunUntilIdle();
|
|
|
| - forms = form_cache.ExtractNewForms(*web_frame);
|
| + forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| const std::vector<FormFieldData>& fields = forms[0].fields;
|
| @@ -1106,8 +1106,7 @@ TEST_F(FormAutofillTest, OnlyExtractNewForms) {
|
| "document.body.appendChild(newForm);");
|
| msg_loop_.RunUntilIdle();
|
|
|
| - web_frame = GetMainFrame();
|
| - forms = form_cache.ExtractNewForms(*web_frame);
|
| + forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| const std::vector<FormFieldData>& fields2 = forms[0].fields;
|
| @@ -1137,8 +1136,8 @@ TEST_F(FormAutofillTest, ExtractFormsTooFewFields) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_TRUE(forms.empty());
|
| }
|
|
|
| @@ -1152,8 +1151,8 @@ TEST_F(FormAutofillTest, ExtractFormsSkippedForms) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_TRUE(forms.empty());
|
| }
|
|
|
| @@ -1165,8 +1164,8 @@ TEST_F(FormAutofillTest, ExtractFormsNoFields) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_TRUE(forms.empty());
|
| }
|
|
|
| @@ -1184,8 +1183,8 @@ TEST_F(FormAutofillTest, ExtractFormsTooFewFieldsSkipsCheckable) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_TRUE(forms.empty());
|
| }
|
|
|
| @@ -1280,8 +1279,8 @@ TEST_F(FormAutofillTest, FindFormForInputElement) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -1372,8 +1371,8 @@ TEST_F(FormAutofillTest, FindFormForTextAreaElement) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -2556,8 +2555,8 @@ TEST_F(FormAutofillTest, FillFormMaxLength) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -2654,8 +2653,8 @@ TEST_F(FormAutofillTest, FillFormNegativeMaxLength) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -2733,8 +2732,8 @@ TEST_F(FormAutofillTest, FillFormEmptyName) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -2821,8 +2820,8 @@ TEST_F(FormAutofillTest, FillFormEmptyFormNames) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(2U, forms.size());
|
|
|
| // Get the input element we want to find.
|
| @@ -3042,8 +3041,8 @@ TEST_F(FormAutofillTest, FillFormNonEmptyField) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*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.
|
| @@ -3155,8 +3154,8 @@ TEST_F(FormAutofillTest, ClearFormWithNode) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Set the auto-filled attribute.
|
| @@ -3262,8 +3261,8 @@ TEST_F(FormAutofillTest, ClearFormWithNodeContainingSelectOne) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Set the auto-filled attribute.
|
| @@ -3336,8 +3335,8 @@ TEST_F(FormAutofillTest, ClearPreviewedFormWithElement) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Set the auto-filled attribute.
|
| @@ -3398,8 +3397,8 @@ TEST_F(FormAutofillTest, ClearPreviewedFormWithNonEmptyInitiatingNode) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Set the auto-filled attribute.
|
| @@ -3460,8 +3459,8 @@ TEST_F(FormAutofillTest, ClearPreviewedFormWithAutofilledInitiatingNode) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Set the auto-filled attribute.
|
| @@ -3523,8 +3522,8 @@ TEST_F(FormAutofillTest, ClearOnlyAutofilledFields) {
|
| WebFrame* web_frame = GetMainFrame();
|
| ASSERT_NE(nullptr, web_frame);
|
|
|
| - FormCache form_cache;
|
| - std::vector<FormData> forms = form_cache.ExtractNewForms(*web_frame);
|
| + FormCache form_cache(*web_frame);
|
| + std::vector<FormData> forms = form_cache.ExtractNewForms();
|
| ASSERT_EQ(1U, forms.size());
|
|
|
| // Set the autofilled attribute.
|
|
|