chrome/renderer/autofill/form_autocomplete_browsertest.cc - Issue 821453003: Update legacy Tuple-using code.

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

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: media Created 6 years 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

« base/observer_list_threadsafe.h ('K') | « chrome/renderer/autofill/autofill_renderer_browsertest.cc ('k') | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('j') | components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/autofill/form_autocomplete_browsertest.cc

diff --git a/chrome/renderer/autofill/form_autocomplete_browsertest.cc b/chrome/renderer/autofill/form_autocomplete_browsertest.cc

index 5f49d9d868e3967b07d60bd6aa6c89a4d1368997..0c05648f9e310ca68776dfed738112d2fa5528b8 100644

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

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

@@ -36,15 +36,15 @@ TEST_F(FormAutocompleteTest, NormalFormSubmit) {

ASSERT_TRUE(message != NULL);

// The tuple also includes a timestamp, which is ignored.

- Tuple2<FormData, base::TimeTicks> forms;

+ Tuple<FormData, base::TimeTicks> forms;

AutofillHostMsg_FormSubmitted::Read(message, &forms);

- ASSERT_EQ(2U, forms.a.fields.size());

+ ASSERT_EQ(2U, get<0>(forms).fields.size());

- FormFieldData& form_field = forms.a.fields[0];

+ FormFieldData& form_field = get<0>(forms).fields[0];

EXPECT_EQ(WebString("fname"), form_field.name);

EXPECT_EQ(WebString("Rick"), form_field.value);

- form_field = forms.a.fields[1];

+ form_field = get<0>(forms).fields[1];

EXPECT_EQ(WebString("lname"), form_field.name);

EXPECT_EQ(WebString("Deckard"), form_field.value);

}

@@ -67,15 +67,15 @@ TEST_F(FormAutocompleteTest, AutoCompleteOffFormSubmit) {

ASSERT_TRUE(message != NULL);

// The tuple also includes a timestamp, which is ignored.

- Tuple2<FormData, base::TimeTicks> forms;

+ Tuple<FormData, base::TimeTicks> forms;

AutofillHostMsg_FormSubmitted::Read(message, &forms);

- ASSERT_EQ(2U, forms.a.fields.size());

+ ASSERT_EQ(2U, get<0>(forms).fields.size());

- FormFieldData& form_field = forms.a.fields[0];

+ FormFieldData& form_field = get<0>(forms).fields[0];

EXPECT_EQ(WebString("fname"), form_field.name);

EXPECT_EQ(WebString("Rick"), form_field.value);

- form_field = forms.a.fields[1];

+ form_field = get<0>(forms).fields[1];

EXPECT_EQ(WebString("lname"), form_field.name);

EXPECT_EQ(WebString("Deckard"), form_field.value);

}

@@ -97,15 +97,15 @@ TEST_F(FormAutocompleteTest, AutoCompleteOffInputSubmit) {

ASSERT_TRUE(message != NULL);

// The tuple also includes a timestamp, which is ignored.

- Tuple2<FormData, base::TimeTicks> forms;

+ Tuple<FormData, base::TimeTicks> forms;

AutofillHostMsg_FormSubmitted::Read(message, &forms);

- ASSERT_EQ(2U, forms.a.fields.size());

+ ASSERT_EQ(2U, get<0>(forms).fields.size());

- FormFieldData& form_field = forms.a.fields[0];

+ FormFieldData& form_field = get<0>(forms).fields[0];

EXPECT_EQ(WebString("fname"), form_field.name);

EXPECT_EQ(WebString("Rick"), form_field.value);

- form_field = forms.a.fields[1];

+ form_field = get<0>(forms).fields[1];

EXPECT_EQ(WebString("lname"), form_field.name);

EXPECT_EQ(WebString("Deckard"), form_field.value);

}

@@ -138,15 +138,15 @@ TEST_F(FormAutocompleteTest, DynamicAutoCompleteOffFormSubmit) {

ASSERT_TRUE(message != NULL);

// The tuple also includes a timestamp, which is ignored.

- Tuple2<FormData, base::TimeTicks> forms;

+ Tuple<FormData, base::TimeTicks> forms;

AutofillHostMsg_FormSubmitted::Read(message, &forms);

- ASSERT_EQ(2U, forms.a.fields.size());

+ ASSERT_EQ(2U, get<0>(forms).fields.size());

- FormFieldData& form_field = forms.a.fields[0];

+ FormFieldData& form_field = get<0>(forms).fields[0];

EXPECT_EQ(WebString("fname"), form_field.name);

EXPECT_EQ(WebString("Rick"), form_field.value);

- form_field = forms.a.fields[1];

+ form_field = get<0>(forms).fields[1];

EXPECT_EQ(WebString("lname"), form_field.name);

EXPECT_EQ(WebString("Deckard"), form_field.value);

}