components/password_manager/core/browser/password_form_manager_unittest.cc - Issue 1314903003: Updating of all entries in PasswordManager of the same credentials on password update

Unified Diff: components/password_manager/core/browser/password_form_manager_unittest.cc

Issue 1314903003: Updating of all entries in PasswordManager of the same credentials on password update (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comments addressed Created 5 years, 3 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

« components/password_manager/core/browser/password_form_manager.cc ('K') | « components/password_manager/core/browser/password_form_manager.cc ('k') | components/password_manager/core/browser/password_store.cc » ('j') | components/password_manager/core/browser/password_store_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/password_manager/core/browser/password_form_manager_unittest.cc

diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc

index a3e0339c253ed5f39724ee725801e4be4a591647..241533dc8857d36822d6b9042c7e264c7c8f756b 100644

--- a/components/password_manager/core/browser/password_form_manager_unittest.cc

+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc

@@ -184,7 +184,11 @@ class PasswordFormManagerTest : public testing::Test {

// Types of possible outcomes of simulated matching, see

// SimulateMatchingPhase.

- enum ResultOfSimulatedMatching { RESULT_MATCH_FOUND, RESULT_NO_MATCH };

+ enum ResultOfSimulatedMatching {

+ RESULT_NO_MATCH,

+ RESULT_SAVED_MATCH = 1 << 0, // Include saved_match_ in store results.

+ RESULT_PSL_MATCH = 1 << 1, // Include psl_saved_match_ in store results.

+ };

void SetUp() override {

observed_form_.origin = GURL("http://accounts.google.com/a/LoginAuth");

@@ -203,6 +207,11 @@ class PasswordFormManagerTest : public testing::Test {

saved_match_.other_possible_usernames.push_back(

ASCIIToUTF16("test2@gmail.com"));

+ psl_saved_match_ = saved_match_;

+ psl_saved_match_.is_public_suffix_match = true;

+ psl_saved_match_.origin =

+ GURL("http://m.accounts.google.com/a/ServiceLoginAuth");

autofill::FormFieldData field;

field.label = ASCIIToUTF16("full_name");

field.name = ASCIIToUTF16("full_name");

@@ -245,9 +254,16 @@ class PasswordFormManagerTest : public testing::Test {

return;

}

- scoped_ptr<PasswordForm> match(new PasswordForm(saved_match_));

+ scoped_ptr<PasswordForm> match;

vasilii 2015/09/25 14:16:15 |match| is unused.

dvadym 2015/09/28 13:58:41 Thanks, removed

ScopedVector<PasswordForm> result_form;

- result_form.push_back(match.Pass());

+ if (result & RESULT_SAVED_MATCH) {

+ match.reset(new PasswordForm(saved_match_));

+ result_form.push_back(match.Pass());

+ }

+ if (result & RESULT_PSL_MATCH) {

+ match.reset(new PasswordForm(psl_saved_match_));

+ result_form.push_back(match.Pass());

+ }

p->OnGetPasswordStoreResults(result_form.Pass());

}

@@ -311,6 +327,7 @@ class PasswordFormManagerTest : public testing::Test {

PasswordForm* observed_form() { return &observed_form_; }

PasswordForm* saved_match() { return &saved_match_; }

+ PasswordForm* psl_saved_match() { return &psl_saved_match_; }

PasswordForm* CreateSavedMatch(bool blacklisted) {

// Owned by the caller of this method.

PasswordForm* match = new PasswordForm(saved_match_);

@@ -333,6 +350,7 @@ class PasswordFormManagerTest : public testing::Test {

PasswordForm observed_form_;

PasswordForm saved_match_;

+ PasswordForm psl_saved_match_;

scoped_refptr<NiceMock<MockPasswordStore>> mock_store_;

scoped_ptr<TestPasswordManagerClient> client_;

scoped_ptr<PasswordManager> password_manager_;

@@ -375,7 +393,7 @@ TEST_F(PasswordFormManagerTest, TestAdditionalLogin) {

// Now, suppose the user re-visits the site and wants to save an additional

// login for the site with a new username. In this case, the matching phase

// will yield the previously saved login.

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// Set up the new login.

base::string16 new_user = ASCIIToUTF16("newuser");

base::string16 new_pass = ASCIIToUTF16("newpass");

@@ -406,7 +424,7 @@ TEST_F(PasswordFormManagerTest, TestAdditionalLogin) {

TEST_F(PasswordFormManagerTest, TestBlacklist) {

saved_match()->origin = observed_form()->origin;

saved_match()->action = observed_form()->action;

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// Set up the new login.

PasswordForm credentials = *observed_form();

credentials.username_value = ASCIIToUTF16("newuser");

@@ -442,7 +460,8 @@ TEST_F(PasswordFormManagerTest, TestBlacklistMatching) {

// Doesn't match because of PSL.

PasswordForm blacklisted_psl = *observed_form();

- blacklisted_psl.original_signon_realm = "http://m.accounts.google.com";

+ blacklisted_psl.signon_realm = "http://m.accounts.google.com";

+ blacklisted_psl.is_public_suffix_match = true;

blacklisted_psl.blacklisted_by_user = true;

// Doesn't match because of different origin.

@@ -508,8 +527,8 @@ TEST_F(PasswordFormManagerTest, AutofillBlacklisted) {

TEST_F(PasswordFormManagerTest,

OverriddenPSLMatchedCredentialsNotMarkedAsPSLMatched) {

// The suggestion needs to be PSL-matched.

- saved_match()->original_signon_realm = "www.example.org";

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ saved_match()->is_public_suffix_match = true;

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// User modifies the suggested password and submits the form.

PasswordForm credentials(*observed_form());

@@ -525,8 +544,8 @@ TEST_F(PasswordFormManagerTest,

TEST_F(PasswordFormManagerTest, PSLMatchedCredentialsMetadataUpdated) {

// The suggestion needs to be PSL-matched.

- saved_match()->original_signon_realm = "www.example.org";

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ saved_match()->is_public_suffix_match = true;

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

PasswordForm submitted_form(*observed_form());

submitted_form.preferred = true;

@@ -539,9 +558,9 @@ TEST_F(PasswordFormManagerTest, PSLMatchedCredentialsMetadataUpdated) {

expected_saved_form.times_used = 1;

expected_saved_form.other_possible_usernames.clear();

expected_saved_form.form_data = saved_match()->form_data;

- expected_saved_form.origin = saved_match()->origin;

- expected_saved_form.original_signon_realm =

- saved_match()->original_signon_realm;

+ expected_saved_form.origin = observed_form()->origin;

+ expected_saved_form.is_public_suffix_match =

+ saved_match()->is_public_suffix_match;

PasswordForm actual_saved_form;

EXPECT_CALL(*(client()->mock_driver()->mock_autofill_manager()),

@@ -597,7 +616,7 @@ TEST_F(PasswordFormManagerTest, TestNewLoginFromNewPasswordElement) {

}

TEST_F(PasswordFormManagerTest, TestUpdatePassword) {

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// User submits credentials for the observed form using a username previously

// stored, but a new password. Note that the observed form may have different

@@ -644,7 +663,7 @@ TEST_F(PasswordFormManagerTest, TestUpdatePasswordFromNewPasswordElement) {

PasswordFormManager form_manager(password_manager(), client(),

client()->driver(), *observed_form(), false);

- SimulateMatchingPhase(&form_manager, RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH);

// User submits current and new credentials to the observed form.

PasswordForm credentials(*observed_form());

@@ -751,7 +770,7 @@ TEST_F(PasswordFormManagerTest, TestIgnoreResult_IgnoredCredentials) {

TEST_F(PasswordFormManagerTest, TestEmptyAction) {

saved_match()->action = GURL();

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// User logs in with the autofilled username / password from saved_match.

PasswordForm login = *observed_form();

@@ -766,7 +785,7 @@ TEST_F(PasswordFormManagerTest, TestEmptyAction) {

}

TEST_F(PasswordFormManagerTest, TestUpdateAction) {

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// User logs in with the autofilled username / password from saved_match.

PasswordForm login = *observed_form();

@@ -1056,10 +1075,10 @@ TEST_F(PasswordFormManagerTest,

ScopedVector<PasswordForm> simulated_results;

simulated_results.push_back(CreateSavedMatch(false));

- simulated_results[1]->username_value = ASCIIToUTF16("other@gmail.com");

- simulated_results[1]->password_element = ASCIIToUTF16("signup_password");

- simulated_results[1]->username_element = ASCIIToUTF16("signup_username");

- simulated_results[1]->type = PasswordForm::TYPE_GENERATED;

+ simulated_results[0]->username_value = ASCIIToUTF16("other@gmail.com");

+ simulated_results[0]->password_element = ASCIIToUTF16("signup_password");

+ simulated_results[0]->username_element = ASCIIToUTF16("signup_username");

+ simulated_results[0]->type = PasswordForm::TYPE_GENERATED;

form_manager()->SimulateFetchMatchingLoginsFromPasswordStore();

autofill::PasswordFormFillData fill_data;

@@ -1207,7 +1226,7 @@ TEST_F(PasswordFormManagerTest, TestScoringPublicSuffixMatch) {

ScopedVector<PasswordForm> simulated_results;

simulated_results.push_back(CreateSavedMatch(false));

- simulated_results[0]->original_signon_realm = "http://accounts2.google.com";

+ simulated_results[0]->is_public_suffix_match = true;

simulated_results[1]->origin =

GURL("http://accounts.google.com/a/ServiceLoginAuth2");

simulated_results[1]->action =

@@ -1221,10 +1240,8 @@ TEST_F(PasswordFormManagerTest, TestScoringPublicSuffixMatch) {

form_manager()->OnGetPasswordStoreResults(simulated_results.Pass());

EXPECT_TRUE(fill_data.additional_logins.empty());

EXPECT_EQ(1u, form_manager()->best_matches().size());

- EXPECT_TRUE(form_manager()

- ->best_matches()

- .begin()

- ->second->original_signon_realm.empty());

+ EXPECT_TRUE(

+ !form_manager()->best_matches().begin()->second->is_public_suffix_match);

}

TEST_F(PasswordFormManagerTest, AndroidCredentialsAreAutofilled) {

@@ -1235,9 +1252,7 @@ TEST_F(PasswordFormManagerTest, AndroidCredentialsAreAutofilled) {

// filled on username-select.

ScopedVector<PasswordForm> simulated_results;

simulated_results.push_back(new PasswordForm());

- simulated_results[0]->signon_realm = observed_form()->signon_realm;

- simulated_results[0]->original_signon_realm =

- "android://hash@com.google.android";

+ simulated_results[0]->signon_realm = "android://hash@com.google.android";

vasilii 2015/09/25 14:16:15 An Android credential is a PSL match or not?

dvadym 2015/09/28 13:58:41 No, it was just a hack. Android credentials has no

simulated_results[0]->origin = observed_form()->origin;

simulated_results[0]->username_value = saved_match()->username_value;

simulated_results[0]->password_value = saved_match()->password_value;

@@ -1381,9 +1396,9 @@ TEST_F(PasswordFormManagerTest, CorrectlyUpdatePasswordsWithSameUsername) {

form_manager()->SimulateFetchMatchingLoginsFromPasswordStore();

form_manager()->OnGetPasswordStoreResults(result.Pass());

- // We always take the last credential with a particular username, regardless

+ // We always take the first credential with a particular username, regardless

// of which ones are labeled preferred.

- EXPECT_EQ(ASCIIToUTF16("second"),

+ EXPECT_EQ(ASCIIToUTF16("first"),

form_manager()->preferred_match()->password_value);

PasswordForm login(*observed_form());

@@ -1575,7 +1590,7 @@ TEST_F(PasswordFormManagerTest,

PasswordFormManager form_manager(password_manager(), client(),

client()->driver(), *observed_form(), false);

- SimulateMatchingPhase(&form_manager, RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH);

// The user submits a password on a change-password form, which does not use

// the "autocomplete=username" mark-up (therefore Chrome had to guess what is

@@ -1592,7 +1607,7 @@ TEST_F(PasswordFormManagerTest,

TEST_F(PasswordFormManagerTest,

IsIngnorableChangePasswordForm_NotMatchingPassword) {

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// The user submits a password on a change-password form, which does not use

// the "autocomplete=username" mark-up (therefore Chrome had to guess what is

@@ -1609,7 +1624,7 @@ TEST_F(PasswordFormManagerTest,

TEST_F(PasswordFormManagerTest,

IsIngnorableChangePasswordForm_NotMatchingUsername) {

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

// The user submits a password on a change-password form, which does not use

// the "autocomplete=username" mark-up (therefore Chrome had to guess what is

@@ -1705,7 +1720,7 @@ TEST_F(PasswordFormManagerTest, TestUpdateMethod) {

PasswordFormManager form_manager(password_manager(), client(),

client()->driver(), *observed_form(), false);

- SimulateMatchingPhase(&form_manager, RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH);

// User submits current and new credentials to the observed form.

PasswordForm credentials(*observed_form());

credentials.username_element.clear();

@@ -1763,7 +1778,7 @@ TEST_F(PasswordFormManagerTest, TestUpdateNoUsernameTextfieldPresent) {

PasswordFormManager form_manager(password_manager(), client(),

client()->driver(), *observed_form(), false);

- SimulateMatchingPhase(&form_manager, RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH);

// User submits current and new credentials to the observed form.

PasswordForm credentials(*observed_form());

// The |username_value| contains a text that's unlikely to be real username.

@@ -1924,7 +1939,7 @@ TEST_F(PasswordFormManagerTest, RemoveNoUsernameAccounts) {

TEST_F(PasswordFormManagerTest, NotRemovePSLNoUsernameAccounts) {

PasswordForm saved_form = *saved_match();

saved_form.username_value.clear();

- saved_form.original_signon_realm = "www.example.org";

+ saved_form.is_public_suffix_match = true;

ScopedVector<PasswordForm> result;

result.push_back(new PasswordForm(saved_form));

form_manager()->SimulateFetchMatchingLoginsFromPasswordStore();

@@ -2131,12 +2146,12 @@ TEST_F(PasswordFormManagerTest,

TEST_F(PasswordFormManagerTest, ProcessFrame) {

EXPECT_CALL(*client()->mock_driver(), FillPasswordForm(_));

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

}

TEST_F(PasswordFormManagerTest, ProcessFrame_MoreProcessFrameMoreFill) {

EXPECT_CALL(*client()->mock_driver(), FillPasswordForm(_)).Times(2);

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

form_manager()->ProcessFrame(client()->mock_driver()->AsWeakPtr());

}

@@ -2145,7 +2160,7 @@ TEST_F(PasswordFormManagerTest, ProcessFrame_TwoDrivers) {

EXPECT_CALL(*client()->mock_driver(), FillPasswordForm(_));

EXPECT_CALL(second_driver, FillPasswordForm(_));

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

form_manager()->ProcessFrame(second_driver.AsWeakPtr());

}

@@ -2172,8 +2187,8 @@ TEST_F(PasswordFormManagerTest, ProcessFrame_DriverBeforeMatching) {

TEST_F(PasswordFormManagerTest, ProcessFrame_StoreUpdatesCausesAutofill) {

EXPECT_CALL(*client()->mock_driver(), FillPasswordForm(_)).Times(2);

- SimulateMatchingPhase(form_manager(), RESULT_MATCH_FOUND);

+ SimulateMatchingPhase(form_manager(), RESULT_SAVED_MATCH);

}

TEST_F(PasswordFormManagerTest, UpdateFormManagers_IsCalled) {

@@ -2202,4 +2217,158 @@ TEST_F(PasswordFormManagerTest, UpdateFormManagers_IsCalled) {

form_manager()->Save();

}

+TEST_F(PasswordFormManagerTest, TestUpdatePSLMatchedCredentials) {

+ PasswordFormManager form_manager(password_manager(), client(),

+ client()->driver(), *observed_form(), false);

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH | RESULT_PSL_MATCH);

+ // User submits a credentials with an old username and a new password.

+ PasswordForm credentials(*observed_form());

+ credentials.username_value = saved_match()->username_value;

+ credentials.password_value =

+ saved_match()->password_value + ASCIIToUTF16("1");

vasilii 2015/09/25 14:16:15 I personally like how other test just assign crede

dvadym 2015/09/28 13:58:40 Done.

+ credentials.preferred = true;

+ form_manager.ProvisionallySave(

+ credentials, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);

+ // Successful login. The PasswordManager would instruct PasswordFormManager

+ // to save, and since this is an update, it should know not to save as a new

+ // login.

+ EXPECT_FALSE(form_manager.IsNewLogin());

+ // Trigger saving to exercise some special case handling in UpdateLogin().

+ PasswordForm new_credentials[2];

+ EXPECT_CALL(*mock_store(), UpdateLogin(_))

+ .WillOnce(testing::SaveArg<0>(&new_credentials[0]))

+ .WillOnce(testing::SaveArg<0>(&new_credentials[1]));

+ form_manager.Save();

+ Mock::VerifyAndClearExpectations(mock_store());

+ // No meta-information should be updated, only the password.

vasilii 2015/09/25 14:16:15 If this is true, may be it's short to use operator

dvadym 2015/09/28 13:58:40 Unfortunetely it doesn't work, since the forms hav

+ EXPECT_EQ(credentials.password_value, new_credentials[0].password_value);

+ EXPECT_EQ(saved_match()->username_value, new_credentials[0].username_value);

+ EXPECT_EQ(saved_match()->username_element,

+ new_credentials[0].username_element);

+ EXPECT_EQ(saved_match()->password_element,

+ new_credentials[0].password_element);

+ EXPECT_EQ(saved_match()->origin, new_credentials[0].origin);

+ EXPECT_EQ(credentials.password_value, new_credentials[1].password_value);

+ EXPECT_EQ(psl_saved_match()->username_element,

+ new_credentials[1].username_element);

+ EXPECT_EQ(psl_saved_match()->username_element,

+ new_credentials[1].username_element);

+ EXPECT_EQ(psl_saved_match()->password_element,

+ new_credentials[1].password_element);

+ EXPECT_EQ(psl_saved_match()->origin, new_credentials[1].origin);

+TEST_F(PasswordFormManagerTest,

+ TestNotUpdatePSLMatchedCredentialsWithAnotherUsername) {

+ PasswordFormManager form_manager(password_manager(), client(),

+ client()->driver(), *observed_form(), false);

+ psl_saved_match()->username_value += ASCIIToUTF16("1");

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH | RESULT_PSL_MATCH);

+ // User submits a credentials with an old username and a new password.

+ PasswordForm credentials(*observed_form());

+ credentials.username_value = saved_match()->username_value;

+ credentials.password_value =

+ saved_match()->password_value + ASCIIToUTF16("1");

+ credentials.preferred = true;

+ form_manager.ProvisionallySave(

+ credentials, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);

+ // Successful login. The PasswordManager would instruct PasswordFormManager

+ // to save, and since this is an update, it should know not to save as a new

+ // login.

+ EXPECT_FALSE(form_manager.IsNewLogin());

+ // Trigger saving to exercise some special case handling in UpdateLogin().

+ PasswordForm new_credentials;

+ EXPECT_CALL(*mock_store(), UpdateLogin(_))

+ .WillOnce(testing::SaveArg<0>(&new_credentials));

+ form_manager.Save();

+ Mock::VerifyAndClearExpectations(mock_store());

+ // No meta-information should be updated, only the password.

vasilii 2015/09/25 14:16:15 If |saved_match()| has all the metadata like the u

dvadym 2015/09/28 13:58:40 Unfortunetely it doesn't work, since the forms hav

+ EXPECT_EQ(credentials.password_value, new_credentials.password_value);

+ EXPECT_EQ(saved_match()->username_value, new_credentials.username_value);

+ EXPECT_EQ(saved_match()->password_element, new_credentials.password_element);

+ EXPECT_EQ(saved_match()->username_element, new_credentials.username_element);

+ EXPECT_EQ(saved_match()->origin, new_credentials.origin);

+TEST_F(PasswordFormManagerTest,

+ TestNotUpdatePSLMatchedCredentialsWithAnotherPassword) {

+ PasswordFormManager form_manager(password_manager(), client(),

+ client()->driver(), *observed_form(), false);

+ psl_saved_match()->password_value += ASCIIToUTF16("2");

+ SimulateMatchingPhase(&form_manager, RESULT_SAVED_MATCH | RESULT_PSL_MATCH);

+ // User submits a credentials with an old username and a new password.

+ PasswordForm credentials(*observed_form());

+ credentials.username_value = saved_match()->username_value;

+ credentials.password_value =

+ saved_match()->password_value + ASCIIToUTF16("1");

+ credentials.preferred = true;

+ form_manager.ProvisionallySave(

+ credentials, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);

+ // Successful login. The PasswordManager would instruct PasswordFormManager

+ // to save, and since this is an update, it should know not to save as a new

+ // login.

+ EXPECT_FALSE(form_manager.IsNewLogin());

+ // Trigger saving to exercise some special case handling in UpdateLogin().

+ PasswordForm new_credentials;

+ EXPECT_CALL(*mock_store(), UpdateLogin(_))

+ .WillOnce(testing::SaveArg<0>(&new_credentials));

+ form_manager.Save();

+ Mock::VerifyAndClearExpectations(mock_store());

+ // No meta-information should be updated, only the password.

+ EXPECT_EQ(credentials.password_value, new_credentials.password_value);

+ EXPECT_EQ(saved_match()->username_value, new_credentials.username_value);

+ EXPECT_EQ(saved_match()->password_element, new_credentials.password_element);

+ EXPECT_EQ(saved_match()->username_element, new_credentials.username_element);

+ EXPECT_EQ(saved_match()->origin, new_credentials.origin);

+TEST_F(PasswordFormManagerTest, TestNotUpdateWhenOnlyPSLMatched) {

+ PasswordFormManager form_manager(password_manager(), client(),

+ client()->driver(), *observed_form(), false);

+ SimulateMatchingPhase(&form_manager, RESULT_PSL_MATCH);

+ // User submits a credentials with an old username and a new password.

+ PasswordForm credentials(*observed_form());

+ credentials.username_value = saved_match()->username_value;

+ credentials.password_value =

+ saved_match()->password_value + ASCIIToUTF16("1");

+ credentials.preferred = true;

+ form_manager.ProvisionallySave(

+ credentials, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);

+ EXPECT_TRUE(form_manager.IsNewLogin());

+ // PSL matched credential should not be updated, since we are not sure that

+ // this is the same credential as submitted one.

+ PasswordForm new_credentials;

+ EXPECT_CALL(*mock_store(), UpdateLogin(_)).Times(0);

+ EXPECT_CALL(*mock_store(), AddLogin(_))

+ .WillOnce(testing::SaveArg<0>(&new_credentials));

+ form_manager.Save();

+ Mock::VerifyAndClearExpectations(mock_store());

+ EXPECT_EQ(credentials.password_value, new_credentials.password_value);

vasilii 2015/09/25 14:16:15 Isn't new_credentials == credentials?

dvadym 2015/09/28 13:58:40 Unfortunetely it doesn't work, since the forms hav

+ EXPECT_EQ(credentials.username_value, new_credentials.username_value);

+ EXPECT_EQ(credentials.password_element, new_credentials.password_element);

+ EXPECT_EQ(credentials.username_element, new_credentials.username_element);

+ EXPECT_EQ(credentials.origin, new_credentials.origin);

} // namespace password_manager