Index: components/password_manager/core/browser/password_manager_unittest.cc |
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc |
index a22aca4050df43027643fc9a0ba0449d412ac922..dfd19dcec23e46e2191a4a8990aed6783ae60a22 100644 |
--- a/components/password_manager/core/browser/password_manager_unittest.cc |
+++ b/components/password_manager/core/browser/password_manager_unittest.cc |
@@ -210,7 +210,7 @@ TEST_F(PasswordManagerTest, FormSubmitEmptyStore) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
// And the form submit contract is to call ProvisionallySavePassword. |
manager()->ProvisionallySavePassword(form); |
@@ -222,7 +222,8 @@ TEST_F(PasswordManagerTest, FormSubmitEmptyStore) { |
// Now the password manager waits for the navigation to complete. |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
ASSERT_TRUE(form_to_save.get()); |
EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))); |
@@ -242,7 +243,7 @@ TEST_F(PasswordManagerTest, GeneratedPasswordFormSubmitEmptyStore) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
// Simulate the user generating the password and submitting the form. |
manager()->SetFormHasGeneratedPassword(form); |
@@ -257,7 +258,8 @@ TEST_F(PasswordManagerTest, GeneratedPasswordFormSubmitEmptyStore) { |
// Now the password manager waits for the navigation to complete. |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
} |
TEST_F(PasswordManagerTest, FormSubmitNoGoodMatch) { |
@@ -276,7 +278,7 @@ TEST_F(PasswordManagerTest, FormSubmitNoGoodMatch) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
manager()->ProvisionallySavePassword(form); |
// We still expect an add, since we didn't have a good match. |
@@ -287,7 +289,8 @@ TEST_F(PasswordManagerTest, FormSubmitNoGoodMatch) { |
// Now the password manager waits for the navigation to complete. |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
ASSERT_TRUE(form_to_save.get()); |
EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))); |
@@ -305,14 +308,15 @@ TEST_F(PasswordManagerTest, FormSeenThenLeftPage) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
// No message from the renderer that a password was submitted. No |
// expected calls. |
EXPECT_CALL(client_, PromptUserToSavePassword(_)).Times(0); |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
} |
TEST_F(PasswordManagerTest, FormSubmitAfterNavigateInPage) { |
@@ -326,7 +330,7 @@ TEST_F(PasswordManagerTest, FormSubmitAfterNavigateInPage) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
// Simulate navigating in the page. |
manager()->DidNavigateMainFrame(true); |
@@ -341,7 +345,8 @@ TEST_F(PasswordManagerTest, FormSubmitAfterNavigateInPage) { |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
ASSERT_FALSE(NULL == form_to_save.get()); |
EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))); |
@@ -370,7 +375,7 @@ TEST_F(PasswordManagerTest, FormSubmitWithFormOnPreviousPage) { |
observed.push_back(first_form); |
manager()->OnPasswordFormsParsed(observed); |
observed.clear(); |
- manager()->OnPasswordFormsRendered(observed); |
+ manager()->OnPasswordFormsRendered(observed, true); |
// Now navigate to a second page. |
manager()->DidNavigateMainFrame(false); |
@@ -379,7 +384,7 @@ TEST_F(PasswordManagerTest, FormSubmitWithFormOnPreviousPage) { |
// URL. |
observed.push_back(second_form); |
manager()->OnPasswordFormsParsed(observed); |
- manager()->OnPasswordFormsRendered(observed); |
+ manager()->OnPasswordFormsRendered(observed, true); |
// Now submit this form |
OnPasswordFormSubmitted(second_form); |
@@ -390,7 +395,7 @@ TEST_F(PasswordManagerTest, FormSubmitWithFormOnPreviousPage) { |
.WillOnce(WithArg<0>(SaveToScopedPtr(&form_to_save))); |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); |
- manager()->OnPasswordFormsRendered(observed); |
+ manager()->OnPasswordFormsRendered(observed, true); |
// Make sure that the saved form matches the second form, not the first. |
ASSERT_TRUE(form_to_save.get()); |
@@ -409,14 +414,14 @@ TEST_F(PasswordManagerTest, FormSubmitFailedLogin) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
manager()->ProvisionallySavePassword(form); |
// The form reappears, and is visible in the layout: |
// No expected calls to the PasswordStore... |
manager()->OnPasswordFormsParsed(observed); |
- manager()->OnPasswordFormsRendered(observed); |
+ manager()->OnPasswordFormsRendered(observed, true); |
} |
TEST_F(PasswordManagerTest, FormSubmitInvisibleLogin) { |
@@ -430,7 +435,7 @@ TEST_F(PasswordManagerTest, FormSubmitInvisibleLogin) { |
PasswordForm form(MakeSimpleForm()); |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
manager()->ProvisionallySavePassword(form); |
@@ -442,7 +447,7 @@ TEST_F(PasswordManagerTest, FormSubmitInvisibleLogin) { |
// The form reappears, but is not visible in the layout: |
manager()->OnPasswordFormsParsed(observed); |
observed.clear(); |
- manager()->OnPasswordFormsRendered(observed); |
+ manager()->OnPasswordFormsRendered(observed, true); |
ASSERT_TRUE(form_to_save.get()); |
EXPECT_CALL(*store_.get(), AddLogin(FormMatches(form))); |
@@ -464,10 +469,11 @@ TEST_F(PasswordManagerTest, InitiallyInvisibleForm) { |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
observed.clear(); |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
} |
TEST_F(PasswordManagerTest, SavingDependsOnManagerEnabledPreference) { |
@@ -511,7 +517,7 @@ TEST_F(PasswordManagerTest, FormSavedWithAutocompleteOff) { |
form.password_autocomplete_set = false; |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
// And the form submit contract is to call ProvisionallySavePassword. |
manager()->ProvisionallySavePassword(form); |
@@ -525,7 +531,8 @@ TEST_F(PasswordManagerTest, FormSavedWithAutocompleteOff) { |
// Now the password manager waits for the navigation to complete. |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
ASSERT_TRUE(form_to_save.get()); |
} |
@@ -542,7 +549,7 @@ TEST_F(PasswordManagerTest, GeneratedPasswordFormSavedAutocompleteOff) { |
form.password_autocomplete_set = false; |
observed.push_back(form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
// Simulate the user generating the password and submitting the form. |
manager()->SetFormHasGeneratedPassword(form); |
@@ -557,7 +564,8 @@ TEST_F(PasswordManagerTest, GeneratedPasswordFormSavedAutocompleteOff) { |
// Now the password manager waits for the navigation to complete. |
observed.clear(); |
manager()->OnPasswordFormsParsed(observed); // The post-navigation load. |
- manager()->OnPasswordFormsRendered(observed); // The post-navigation layout. |
+ manager()->OnPasswordFormsRendered(observed, |
+ true); // The post-navigation layout. |
} |
TEST_F(PasswordManagerTest, SubmissionCallbackTest) { |
@@ -580,7 +588,7 @@ TEST_F(PasswordManagerTest, PasswordFormReappearance) { |
PasswordForm login_form(MakeTwitterLoginForm()); |
observed.push_back(login_form); |
manager()->OnPasswordFormsParsed(observed); // The initial load. |
- manager()->OnPasswordFormsRendered(observed); // The initial layout. |
+ manager()->OnPasswordFormsRendered(observed, true); // The initial layout. |
manager()->ProvisionallySavePassword(login_form); |
@@ -590,7 +598,7 @@ TEST_F(PasswordManagerTest, PasswordFormReappearance) { |
// A PasswordForm appears, and is visible in the layout: |
// No expected calls to the PasswordStore... |
manager()->OnPasswordFormsParsed(observed); |
- manager()->OnPasswordFormsRendered(observed); |
+ manager()->OnPasswordFormsRendered(observed, true); |
} |
} // namespace password_manager |