| Index: chrome/renderer/form_manager_browsertest.cc
|
| diff --git a/chrome/renderer/form_manager_browsertest.cc b/chrome/renderer/form_manager_browsertest.cc
|
| index 15f5ce65b4becc7fb8d4336d517b452d41c1e8d1..7245f09780ad126383c7359ebe15b9f91a56a0be 100644
|
| --- a/chrome/renderer/form_manager_browsertest.cc
|
| +++ b/chrome/renderer/form_manager_browsertest.cc
|
| @@ -2844,6 +2844,8 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithNode) {
|
| " <INPUT type=\"text\" id=\"firstname\" value=\"Wyatt\"/>"
|
| " <INPUT type=\"text\" id=\"lastname\"/>"
|
| " <INPUT type=\"text\" id=\"email\"/>"
|
| + " <INPUT type=\"email\" id=\"email2\"/>"
|
| + " <INPUT type=\"tel\" id=\"phone\"/>"
|
| " <INPUT type=\"submit\" value=\"Send\"/>"
|
| "</FORM>");
|
|
|
| @@ -2868,10 +2870,18 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithNode) {
|
| WebInputElement email =
|
| web_frame->document().getElementById("email").to<WebInputElement>();
|
| email.setAutofilled(true);
|
| + WebInputElement email2 =
|
| + web_frame->document().getElementById("email2").to<WebInputElement>();
|
| + email2.setAutofilled(true);
|
| + WebInputElement phone =
|
| + web_frame->document().getElementById("phone").to<WebInputElement>();
|
| + phone.setAutofilled(true);
|
|
|
| // Set the suggested values on two of the elements.
|
| lastname.setSuggestedValue(ASCIIToUTF16("Earp"));
|
| email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
|
| + email2.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
|
| + phone.setSuggestedValue(ASCIIToUTF16("650-777-9999"));
|
|
|
| // Clear the previewed fields.
|
| EXPECT_TRUE(form_manager.ClearPreviewedFormWithNode(lastname, false));
|
| @@ -2888,6 +2898,12 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithNode) {
|
| EXPECT_TRUE(email.value().isEmpty());
|
| EXPECT_TRUE(email.suggestedValue().isEmpty());
|
| EXPECT_FALSE(email.isAutofilled());
|
| + EXPECT_TRUE(email2.value().isEmpty());
|
| + EXPECT_TRUE(email2.suggestedValue().isEmpty());
|
| + EXPECT_FALSE(email2.isAutofilled());
|
| + EXPECT_TRUE(phone.value().isEmpty());
|
| + EXPECT_TRUE(phone.suggestedValue().isEmpty());
|
| + EXPECT_FALSE(phone.isAutofilled());
|
|
|
| // Verify that the cursor position has been updated.
|
| EXPECT_EQ(0, lastname.selectionStart());
|
| @@ -2899,6 +2915,8 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithNonEmptyInitiatingNode) {
|
| " <INPUT type=\"text\" id=\"firstname\" value=\"W\"/>"
|
| " <INPUT type=\"text\" id=\"lastname\"/>"
|
| " <INPUT type=\"text\" id=\"email\"/>"
|
| + " <INPUT type=\"email\" id=\"email2\"/>"
|
| + " <INPUT type=\"tel\" id=\"phone\"/>"
|
| " <INPUT type=\"submit\" value=\"Send\"/>"
|
| "</FORM>");
|
|
|
| @@ -2923,11 +2941,20 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithNonEmptyInitiatingNode) {
|
| WebInputElement email =
|
| web_frame->document().getElementById("email").to<WebInputElement>();
|
| email.setAutofilled(true);
|
| + WebInputElement email2 =
|
| + web_frame->document().getElementById("email2").to<WebInputElement>();
|
| + email2.setAutofilled(true);
|
| + WebInputElement phone =
|
| + web_frame->document().getElementById("phone").to<WebInputElement>();
|
| + phone.setAutofilled(true);
|
| +
|
|
|
| // Set the suggested values on all of the elements.
|
| firstname.setSuggestedValue(ASCIIToUTF16("Wyatt"));
|
| lastname.setSuggestedValue(ASCIIToUTF16("Earp"));
|
| email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
|
| + email2.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
|
| + phone.setSuggestedValue(ASCIIToUTF16("650-777-9999"));
|
|
|
| // Clear the previewed fields.
|
| EXPECT_TRUE(form_manager.ClearPreviewedFormWithNode(firstname, false));
|
| @@ -2946,6 +2973,12 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithNonEmptyInitiatingNode) {
|
| EXPECT_TRUE(email.value().isEmpty());
|
| EXPECT_TRUE(email.suggestedValue().isEmpty());
|
| EXPECT_FALSE(email.isAutofilled());
|
| + EXPECT_TRUE(email2.value().isEmpty());
|
| + EXPECT_TRUE(email2.suggestedValue().isEmpty());
|
| + EXPECT_FALSE(email2.isAutofilled());
|
| + EXPECT_TRUE(phone.value().isEmpty());
|
| + EXPECT_TRUE(phone.suggestedValue().isEmpty());
|
| + EXPECT_FALSE(phone.isAutofilled());
|
| }
|
|
|
| TEST_F(FormManagerTest, ClearPreviewedFormWithAutofilledInitiatingNode) {
|
| @@ -2953,6 +2986,8 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithAutofilledInitiatingNode) {
|
| " <INPUT type=\"text\" id=\"firstname\" value=\"W\"/>"
|
| " <INPUT type=\"text\" id=\"lastname\"/>"
|
| " <INPUT type=\"text\" id=\"email\"/>"
|
| + " <INPUT type=\"email\" id=\"email2\"/>"
|
| + " <INPUT type=\"tel\" id=\"phone\"/>"
|
| " <INPUT type=\"submit\" value=\"Send\"/>"
|
| "</FORM>");
|
|
|
| @@ -2977,11 +3012,19 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithAutofilledInitiatingNode) {
|
| WebInputElement email =
|
| web_frame->document().getElementById("email").to<WebInputElement>();
|
| email.setAutofilled(true);
|
| + WebInputElement email2 =
|
| + web_frame->document().getElementById("email2").to<WebInputElement>();
|
| + email2.setAutofilled(true);
|
| + WebInputElement phone =
|
| + web_frame->document().getElementById("phone").to<WebInputElement>();
|
| + phone.setAutofilled(true);
|
|
|
| // Set the suggested values on all of the elements.
|
| firstname.setSuggestedValue(ASCIIToUTF16("Wyatt"));
|
| lastname.setSuggestedValue(ASCIIToUTF16("Earp"));
|
| email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
|
| + email2.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
|
| + phone.setSuggestedValue(ASCIIToUTF16("650-777-9999"));
|
|
|
| // Clear the previewed fields.
|
| EXPECT_TRUE(form_manager.ClearPreviewedFormWithNode(firstname, true));
|
| @@ -3000,6 +3043,12 @@ TEST_F(FormManagerTest, ClearPreviewedFormWithAutofilledInitiatingNode) {
|
| EXPECT_TRUE(email.value().isEmpty());
|
| EXPECT_TRUE(email.suggestedValue().isEmpty());
|
| EXPECT_FALSE(email.isAutofilled());
|
| + EXPECT_TRUE(email2.value().isEmpty());
|
| + EXPECT_TRUE(email2.suggestedValue().isEmpty());
|
| + EXPECT_FALSE(email2.isAutofilled());
|
| + EXPECT_TRUE(phone.value().isEmpty());
|
| + EXPECT_TRUE(phone.suggestedValue().isEmpty());
|
| + EXPECT_FALSE(phone.isAutofilled());
|
| }
|
|
|
| TEST_F(FormManagerTest, FormWithNodeIsAutoFilled) {
|
| @@ -3007,6 +3056,8 @@ TEST_F(FormManagerTest, FormWithNodeIsAutoFilled) {
|
| " <INPUT type=\"text\" id=\"firstname\" value=\"Wyatt\"/>"
|
| " <INPUT type=\"text\" id=\"lastname\"/>"
|
| " <INPUT type=\"text\" id=\"email\"/>"
|
| + " <INPUT type=\"email\" id=\"email2\"/>"
|
| + " <INPUT type=\"tel\" id=\"phone\"/>"
|
| " <INPUT type=\"submit\" value=\"Send\"/>"
|
| "</FORM>");
|
|
|
|
|