Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9586)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2148303005: [Password Generation] Sends the flag whether a field has nonempty user input (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes addressed to reviewer comments Created 4 years, 5 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
« no previous file with comments | « no previous file | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('j') | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1945424ef6fb7e7f1b284455b55c14233411dc77..1e989a16e23771f30674faf40cef6edbdd4c2302 100644
--- a/chrome/renderer/autofill/form_autofill_browsertest.cc
+++ b/chrome/renderer/autofill/form_autofill_browsertest.cc
@@ -1613,7 +1613,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormField) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result1;
- WebFormControlElementToFormField(element, EXTRACT_NONE, &result1);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_NONE, &result1);
FormFieldData expected;
expected.form_control_type = "text";
@@ -1624,7 +1624,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormField) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result1);
FormFieldData result2;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result2);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result2);
expected.name = ASCIIToUTF16("element");
expected.value = ASCIIToUTF16("value");
@@ -1641,7 +1641,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldAutocompleteOff) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1662,7 +1662,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldMaxLength) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1682,7 +1682,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldAutofilled) {
WebInputElement element = GetInputElementById("element");
element.setAutofilled(true);
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1705,7 +1705,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToClickableFormField) {
WebInputElement element = GetInputElementById("checkbox");
element.setAutofilled(true);
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
FormFieldData expected;
expected.name = ASCIIToUTF16("checkbox");
@@ -1717,7 +1717,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToClickableFormField) {
element = GetInputElementById("radio");
element.setAutofilled(true);
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
expected.name = ASCIIToUTF16("radio");
expected.value = ASCIIToUTF16("male");
expected.form_control_type = "radio";
@@ -1738,7 +1738,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldSelect) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result1;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result1);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result1);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1750,14 +1750,13 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldSelect) {
FormFieldData result2;
WebFormControlElementToFormField(
- element,
- static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTION_TEXT),
- &result2);
+ element, nullptr,
+ static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTION_TEXT), &result2);
expected.value = ASCIIToUTF16("California");
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result2);
FormFieldData result3;
- WebFormControlElementToFormField(element, EXTRACT_OPTIONS, &result3);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_OPTIONS, &result3);
expected.value.clear();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result3);
@@ -1784,7 +1783,7 @@ TEST_F(FormAutofillTest,
element.setAutofilled(true);
FormFieldData result1;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result1);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result1);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1817,7 +1816,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldLongSelect) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_OPTIONS, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_OPTIONS, &result);
EXPECT_TRUE(result.option_values.empty());
EXPECT_TRUE(result.option_contents.empty());
@@ -1835,7 +1834,8 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldTextArea) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result_sans_value;
- WebFormControlElementToFormField(element, EXTRACT_NONE, &result_sans_value);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_NONE,
+ &result_sans_value);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1844,7 +1844,8 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldTextArea) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result_sans_value);
FormFieldData result_with_value;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result_with_value);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE,
+ &result_with_value);
expected.value = ASCIIToUTF16("This element's value\n"
"spans multiple lines.");
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result_with_value);
@@ -1859,7 +1860,8 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldMonthInput) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result_sans_value;
- WebFormControlElementToFormField(element, EXTRACT_NONE, &result_sans_value);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_NONE,
+ &result_sans_value);
FormFieldData expected;
expected.name = ASCIIToUTF16("element");
@@ -1868,7 +1870,8 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldMonthInput) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result_sans_value);
FormFieldData result_with_value;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result_with_value);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE,
+ &result_with_value);
expected.value = ASCIIToUTF16("2011-12");
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result_with_value);
}
@@ -1885,7 +1888,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldInvalidType) {
WebFormControlElement element = GetFormControlElementById("hidden");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
FormFieldData expected;
expected.max_length = 0;
@@ -1895,7 +1898,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldInvalidType) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result);
element = GetFormControlElementById("submit");
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
expected.name = ASCIIToUTF16("submit");
expected.form_control_type = "submit";
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result);
@@ -1912,7 +1915,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToPasswordFormField) {
WebFormControlElement element = GetFormControlElementById("password");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
FormFieldData expected;
expected.max_length = WebInputElement::defaultMaxLength();
@@ -1987,7 +1990,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldAutocompletetype) {
WebFormControlElement element =
GetFormControlElementById(ASCIIToUTF16(test_cases[i].element_id));
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_NONE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_NONE, &result);
FormFieldData expected;
expected.name = ASCIIToUTF16(test_cases[i].element_id);
@@ -2015,7 +2018,7 @@ TEST_F(FormAutofillTest, DetectTextDirectionFromDirectStyle) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, result.text_direction);
}
@@ -2030,7 +2033,7 @@ TEST_F(FormAutofillTest, DetectTextDirectionFromDirectDIRAttribute) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, result.text_direction);
}
@@ -2046,7 +2049,7 @@ TEST_F(FormAutofillTest, DetectTextDirectionFromParentStyle) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, result.text_direction);
}
@@ -2061,7 +2064,7 @@ TEST_F(FormAutofillTest, DetectTextDirectionFromParentDIRAttribute) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, result.text_direction);
}
@@ -2077,7 +2080,7 @@ TEST_F(FormAutofillTest, DetectTextDirectionWhenStyleAndDIRAttributMixed) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, result.text_direction);
}
@@ -2094,7 +2097,7 @@ TEST_F(FormAutofillTest, TextAlignOverridesDirection) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, result.text_direction);
// text-align: left
@@ -2108,7 +2111,7 @@ TEST_F(FormAutofillTest, TextAlignOverridesDirection) {
element = GetFormControlElementById("element");
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, result.text_direction);
}
@@ -2125,7 +2128,7 @@ TEST_F(FormAutofillTest,
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::LEFT_TO_RIGHT, result.text_direction);
}
@@ -2142,7 +2145,7 @@ TEST_F(FormAutofillTest, DetectTextDirectionWhenAncestorHasInlineStyle) {
WebFormControlElement element = GetFormControlElementById("element");
FormFieldData result;
- WebFormControlElementToFormField(element, EXTRACT_VALUE, &result);
+ WebFormControlElementToFormField(element, nullptr, EXTRACT_VALUE, &result);
EXPECT_EQ(base::i18n::RIGHT_TO_LEFT, result.text_direction);
}
@@ -2183,11 +2186,8 @@ TEST_F(FormAutofillTest, WebFormElementToFormData) {
FormData form;
FormFieldData field;
- EXPECT_TRUE(WebFormElementToFormData(forms[0],
- input_element,
- EXTRACT_VALUE,
- &form,
- &field));
+ EXPECT_TRUE(WebFormElementToFormData(forms[0], input_element, nullptr,
+ EXTRACT_VALUE, &form, &field));
EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
EXPECT_EQ(GetCanonicalOriginForDocument(frame->document()), form.origin);
EXPECT_FALSE(form.origin.is_empty());
@@ -2257,7 +2257,7 @@ TEST_F(FormAutofillTest, WebFormElementConsiderNonControlLabelableElements) {
FormData form;
EXPECT_TRUE(WebFormElementToFormData(web_form, WebFormControlElement(),
- EXTRACT_NONE, &form, nullptr));
+ nullptr, EXTRACT_NONE, &form, nullptr));
const std::vector<FormFieldData>& fields = form.fields;
ASSERT_EQ(1U, fields.size());
@@ -2293,11 +2293,8 @@ TEST_F(FormAutofillTest, MAYBE_WebFormElementToFormDataTooManyFields) {
FormData form;
FormFieldData field;
- EXPECT_FALSE(WebFormElementToFormData(forms[0],
- input_element,
- EXTRACT_VALUE,
- &form,
- &field));
+ EXPECT_FALSE(WebFormElementToFormData(forms[0], input_element, nullptr,
+ EXTRACT_VALUE, &form, &field));
}
// Tests that the |should_autocomplete| is set to false for all the fields when
@@ -2323,7 +2320,7 @@ TEST_F(FormAutofillTest, WebFormElementToFormData_AutocompleteOff_OnForm) {
FormData form;
EXPECT_TRUE(WebFormElementToFormData(web_form, WebFormControlElement(),
- EXTRACT_NONE, &form, nullptr));
+ nullptr, EXTRACT_NONE, &form, nullptr));
for (const FormFieldData& field : form.fields) {
EXPECT_FALSE(field.should_autocomplete);
@@ -2352,7 +2349,7 @@ TEST_F(FormAutofillTest, WebFormElementToFormData_AutocompleteOff_OnField) {
FormData form;
EXPECT_TRUE(WebFormElementToFormData(web_form, WebFormControlElement(),
- EXTRACT_NONE, &form, nullptr));
+ nullptr, EXTRACT_NONE, &form, nullptr));
ASSERT_EQ(3U, form.fields.size());
@@ -2380,7 +2377,7 @@ TEST_F(FormAutofillTest, WebFormElementToFormData_CssClasses) {
FormData form;
EXPECT_TRUE(WebFormElementToFormData(web_form, WebFormControlElement(),
- EXTRACT_NONE, &form, nullptr));
+ nullptr, EXTRACT_NONE, &form, nullptr));
EXPECT_EQ(3U, form.fields.size());
EXPECT_EQ(ASCIIToUTF16("firstname_field"), form.fields[0].css_classes);
@@ -2668,7 +2665,8 @@ TEST_F(FormAutofillTest, WebFormElementToFormDataAutocomplete) {
FormData form;
EXPECT_TRUE(WebFormElementToFormData(web_form, WebFormControlElement(),
- EXTRACT_NONE, &form, nullptr));
+ nullptr, EXTRACT_NONE, &form,
+ nullptr));
}
}
@@ -3955,11 +3953,8 @@ TEST_F(FormAutofillTest, ThreePartPhone) {
ASSERT_EQ(1U, forms.size());
FormData form;
- EXPECT_TRUE(WebFormElementToFormData(forms[0],
- WebFormControlElement(),
- EXTRACT_VALUE,
- &form,
- nullptr));
+ EXPECT_TRUE(WebFormElementToFormData(forms[0], WebFormControlElement(),
+ nullptr, EXTRACT_VALUE, &form, nullptr));
EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
EXPECT_EQ(GetCanonicalOriginForDocument(frame->document()), form.origin);
EXPECT_FALSE(form.origin.is_empty());
@@ -4013,11 +4008,8 @@ TEST_F(FormAutofillTest, MaxLengthFields) {
ASSERT_EQ(1U, forms.size());
FormData form;
- EXPECT_TRUE(WebFormElementToFormData(forms[0],
- WebFormControlElement(),
- EXTRACT_VALUE,
- &form,
- nullptr));
+ EXPECT_TRUE(WebFormElementToFormData(forms[0], WebFormControlElement(),
+ nullptr, EXTRACT_VALUE, &form, nullptr));
EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
EXPECT_EQ(GetCanonicalOriginForDocument(frame->document()), form.origin);
EXPECT_EQ(GURL("http://cnn.com"), form.action);
@@ -4359,7 +4351,7 @@ TEST_F(FormAutofillTest, SelectOneAsText) {
// Extract the country select-one value as text.
EXPECT_TRUE(WebFormElementToFormData(
- forms[0], WebFormControlElement(),
+ forms[0], WebFormControlElement(), nullptr,
static_cast<ExtractMask>(EXTRACT_VALUE | EXTRACT_OPTION_TEXT), &form,
nullptr));
EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
@@ -4394,11 +4386,8 @@ TEST_F(FormAutofillTest, SelectOneAsText) {
form.fields.clear();
// Extract the country select-one value as value.
- EXPECT_TRUE(WebFormElementToFormData(forms[0],
- WebFormControlElement(),
- EXTRACT_VALUE,
- &form,
- nullptr));
+ EXPECT_TRUE(WebFormElementToFormData(forms[0], WebFormControlElement(),
+ nullptr, EXTRACT_VALUE, &form, nullptr));
EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
EXPECT_EQ(GetCanonicalOriginForDocument(frame->document()), form.origin);
EXPECT_EQ(GURL("http://cnn.com"), form.action);
« no previous file with comments | « no previous file | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('j') | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698