chrome/renderer/autofill/form_autofill_browsertest.cc - Issue 1106313002: Revert of Limit form-less Autofilling to pages that look like checkout pages.

Unified Diff: chrome/renderer/autofill/form_autofill_browsertest.cc

Issue 1106313002: Revert of Limit form-less Autofilling to pages that look like checkout pages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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 88d8994a424f5ce991acf4459c8ecd983fcbbb7b..394aef82d6bc3be67504f96ebdcdc1f312884130 100644

--- a/chrome/renderer/autofill/form_autofill_browsertest.cc

+++ b/chrome/renderer/autofill/form_autofill_browsertest.cc

@@ -90,7 +90,6 @@

"</FORM>";

const char kUnownedFormHtml[] =

- "<HEAD><TITLE>enter shipping info</TITLE></HEAD>"

"<INPUT type='text' id='firstname'/>"

"<INPUT type='text' id='lastname'/>"

"<INPUT type='hidden' id='imhidden'/>"

@@ -1038,7 +1037,6 @@

EXPECT_TRUE(

FindFormAndFieldForFormControlElement(firstname, &form, &field));

EXPECT_EQ(GURL(web_frame->document().url()), form.origin);

- EXPECT_FALSE(form.origin.is_empty());

if (!unowned) {

EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);

EXPECT_EQ(GURL("http://buh.com"), form.action);

@@ -1133,7 +1131,6 @@

EXPECT_TRUE(

FindFormAndFieldForFormControlElement(firstname, &form, &field));

EXPECT_EQ(GURL(web_frame->document().url()), form.origin);

- EXPECT_FALSE(form.origin.is_empty());

if (!unowned) {

EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);

EXPECT_EQ(GURL("http://buh.com"), form.action);

@@ -1921,7 +1918,6 @@

&field));

EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);

EXPECT_EQ(GURL(frame->document().url()), form.origin);

- EXPECT_FALSE(form.origin.is_empty());

EXPECT_EQ(GURL("http://cnn.com"), form.action);

const std::vector<FormFieldData>& fields = form.fields;

@@ -2034,7 +2030,6 @@

const FormData& form = forms[0];

EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);

EXPECT_EQ(GURL(web_frame->document().url()), form.origin);

- EXPECT_FALSE(form.origin.is_empty());

EXPECT_EQ(GURL("http://cnn.com"), form.action);

const std::vector<FormFieldData>& fields = form.fields;

@@ -2060,7 +2055,6 @@

const FormData& form2 = forms[1];

EXPECT_EQ(ASCIIToUTF16("TestForm2"), form2.name);

EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);

- EXPECT_FALSE(form.origin.is_empty());

EXPECT_EQ(GURL("http://zoo.com"), form2.action);

const std::vector<FormFieldData>& fields2 = form2.fields;

@@ -2283,7 +2277,6 @@

TEST_F(FormAutofillTest, FindFormForInputElementForUnownedForm) {

TestFindFormForInputElement(

- "<HEAD><TITLE>delivery recipient</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='John'/>"

"<INPUT type='text' id='lastname' value='Smith'/>"

"<INPUT type='text' id='email' value='john@example.com'"

@@ -2311,7 +2304,6 @@

TEST_F(FormAutofillTest, FindFormForTextAreaElementForUnownedForm) {

TestFindFormForTextAreaElement(

- "<HEAD><TITLE>delivery address</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='John'/>"

"<INPUT type='text' id='lastname' value='Smith'/>"

"<INPUT type='text' id='email' value='john@example.com'"

@@ -3379,7 +3371,6 @@

TEST_F(FormAutofillTest, FillFormMaxLengthForUnownedForm) {

TestFillFormMaxLength(

- "<HEAD><TITLE>delivery recipient info</TITLE></HEAD>"

"<INPUT type='text' id='firstname' maxlength='5'/>"

"<INPUT type='text' id='lastname' maxlength='7'/>"

"<INPUT type='text' id='email' maxlength='9'/>"

@@ -3392,7 +3383,6 @@

// maxlength (defined in WebKit.)

TEST_F(FormAutofillTest, FillFormNegativeMaxLength) {

TestFillFormNegativeMaxLength(

- "<HEAD><TITLE>delivery recipient info</TITLE></HEAD>"

"<FORM name='TestForm' action='http://buh.com' method='post'>"

" <INPUT type='text' id='firstname' maxlength='-1'/>"

" <INPUT type='text' id='lastname' maxlength='-10'/>"

@@ -3404,7 +3394,6 @@

TEST_F(FormAutofillTest, FillFormNegativeMaxLengthForUnownedForm) {

TestFillFormNegativeMaxLength(

- "<HEAD><TITLE>delivery recipient info</TITLE></HEAD>"

"<INPUT type='text' id='firstname' maxlength='-1'/>"

"<INPUT type='text' id='lastname' maxlength='-10'/>"

"<INPUT type='text' id='email' maxlength='-13'/>"

@@ -3425,7 +3414,6 @@

TEST_F(FormAutofillTest, FillFormEmptyNameForUnownedForm) {

TestFillFormEmptyName(

- "<HEAD><TITLE>delivery recipient info</TITLE></HEAD>"

"<INPUT type='text' id='firstname'/>"

"<INPUT type='text' id='lastname'/>"

"<INPUT type='text' id='email'/>"

@@ -3452,7 +3440,6 @@

TEST_F(FormAutofillTest, FillFormEmptyFormNamesForUnownedForm) {

TestFillFormEmptyFormNames(

- "<HEAD><TITLE>enter delivery preferences</TITLE></HEAD>"

"<INPUT type='text' id='firstname'/>"

"<INPUT type='text' id='middlename'/>"

"<INPUT type='text' id='lastname'/>"

@@ -3476,6 +3463,7 @@

" <input type='submit' name='reply-send' value='Send'>"

"</FORM>");

WebFrame* frame = GetMainFrame();

ASSERT_NE(nullptr, frame);

@@ -3491,7 +3479,6 @@

nullptr));

EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);

EXPECT_EQ(GURL(frame->document().url()), form.origin);

- EXPECT_FALSE(form.origin.is_empty());

EXPECT_EQ(GURL("http://cnn.com"), form.action);

const std::vector<FormFieldData>& fields = form.fields;

@@ -3606,13 +3593,11 @@

}

TEST_F(FormAutofillTest, FillFormNonEmptyFieldForUnownedForm) {

- TestFillFormNonEmptyField(

- "<HEAD><TITLE>delivery recipient info</TITLE></HEAD>"

- "<INPUT type='text' id='firstname'/>"

- "<INPUT type='text' id='lastname'/>"

- "<INPUT type='text' id='email'/>"

- "<INPUT type='submit' value='Send'/>",

- true);

+ TestFillFormNonEmptyField("<INPUT type='text' id='firstname'/>"

+ "<INPUT type='text' id='lastname'/>"

+ "<INPUT type='text' id='email'/>"

+ "<INPUT type='submit' value='Send'/>",

+ true);

}

TEST_F(FormAutofillTest, ClearFormWithNode) {

@@ -3637,7 +3622,6 @@

TEST_F(FormAutofillTest, ClearFormWithNodeForUnownedForm) {

TestClearFormWithNode(

- "<HEAD><TITLE>store checkout</TITLE></HEAD>"

" "

" <INPUT type='text' id='firstname' value='Wyatt'/>"

" <INPUT type='text' id='lastname' value='Earp'/>"

@@ -3673,7 +3657,6 @@

TEST_F(FormAutofillTest, ClearFormWithNodeContainingSelectOneForUnownedForm) {

TestClearFormWithNodeContainingSelectOne(

- "<HEAD><TITLE>store checkout</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='Wyatt'/>"

"<INPUT type='text' id='lastname' value='Earp'/>"

"<SELECT id='state' name='state'>"

@@ -3700,7 +3683,6 @@

TEST_F(FormAutofillTest, ClearPreviewedFormWithElementForUnownedForm) {

TestClearPreviewedFormWithElement(

- "<HEAD><TITLE>store checkout</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='Wyatt'/>"

"<INPUT type='text' id='lastname'/>"

"<INPUT type='text' id='email'/>"

@@ -3724,7 +3706,6 @@

TEST_F(FormAutofillTest,

ClearPreviewedFormWithNonEmptyInitiatingNodeForUnownedForm) {

TestClearPreviewedFormWithNonEmptyInitiatingNode(

- "<HEAD><TITLE>shipping details</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='W'/>"

"<INPUT type='text' id='lastname'/>"

"<INPUT type='text' id='email'/>"

@@ -3748,7 +3729,6 @@

TEST_F(FormAutofillTest,

ClearPreviewedFormWithAutofilledInitiatingNodeForUnownedForm) {

TestClearPreviewedFormWithAutofilledInitiatingNode(

- "<HEAD><TITLE>shipping details</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='W'/>"

"<INPUT type='text' id='lastname'/>"

"<INPUT type='text' id='email'/>"

@@ -3771,7 +3751,6 @@

TEST_F(FormAutofillTest, ClearOnlyAutofilledFieldsForUnownedForm) {

TestClearOnlyAutofilledFields(

- "<HEAD><TITLE>shipping details</TITLE></HEAD>"

"<INPUT type='text' id='firstname' value='Wyatt'/>"

"<INPUT type='text' id='lastname' value='Earp'/>"

"<INPUT type='email' id='email' value='wyatt@earp.com'/>"

@@ -3934,9 +3913,9 @@

const ExtractMask extract_mask =

static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTIONS);

- LoadHTML("<HEAD><TITLE>delivery info</TITLE></HEAD>"

- "<DIV>"

+ const GURL dummy_origin("http://www.example.com");

+ LoadHTML("<DIV>"

" <FIELDSET>"

" <LABEL for='firstname'>First name:</LABEL>"

" <LABEL for='lastname'>Last name:</LABEL>"

@@ -3959,11 +3938,11 @@

FormData form;

EXPECT_TRUE(UnownedFormElementsAndFieldSetsToFormData(

- fieldsets, control_elements, nullptr, frame->document(), extract_mask,

- &form, nullptr));

+ fieldsets, control_elements, nullptr, dummy_origin, extract_mask, &form,

+ nullptr));

EXPECT_TRUE(form.name.empty());

- EXPECT_EQ(frame->document().url(), form.origin);

+ EXPECT_EQ(dummy_origin, form.origin);

EXPECT_FALSE(form.action.is_valid());

const std::vector<FormFieldData>& fields = form.fields;

@@ -3996,9 +3975,9 @@

const ExtractMask extract_mask =

static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTIONS);

- LoadHTML("<HEAD><TITLE>shipping details</TITLE></HEAD>"

- "<DIV>"

+ const GURL dummy_origin("http://www.example.com");

+ LoadHTML("<DIV>"

" <FIELDSET>"

" <LABEL for='firstname'>First name:</LABEL>"

" <LABEL for='lastname'>Last name:</LABEL>"

@@ -4019,11 +3998,11 @@

FormData form;

EXPECT_TRUE(UnownedFormElementsAndFieldSetsToFormData(

- fieldsets, control_elements, nullptr, frame->document(), extract_mask,

- &form, nullptr));

+ fieldsets, control_elements, nullptr, dummy_origin, extract_mask, &form,

+ nullptr));

EXPECT_TRUE(form.name.empty());

- EXPECT_EQ(frame->document().url(), form.origin);

+ EXPECT_EQ(dummy_origin, form.origin);

EXPECT_FALSE(form.action.is_valid());

const std::vector<FormFieldData>& fields = form.fields;

@@ -4055,6 +4034,7 @@

const ExtractMask extract_mask =

static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTIONS);

+ const GURL dummy_origin("http://www.example.com");

LoadHTML(kFormHtml);

@@ -4068,8 +4048,8 @@

FormData form;

EXPECT_FALSE(UnownedFormElementsAndFieldSetsToFormData(

- fieldsets, control_elements, nullptr, frame->document(), extract_mask,

- &form, nullptr));

+ fieldsets, control_elements, nullptr, dummy_origin, extract_mask, &form,

+ nullptr));

}

} // namespace autofill

« no previous file with comments | « no previous file | chrome/test/data/autofill/autofill_noform_dynamic.html » ('j') | no next file with comments »