components/password_manager/core/browser/password_form_manager_unittest.cc - Issue 2985373002: Revert of [Password Manager] Send username correction votes

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

Issue 2985373002: Revert of [Password Manager] Send username correction votes (Closed)

Patch Set: Created 3 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

« no previous file with comments | « components/password_manager/core/browser/password_form_manager.cc ('k') | components/test/data/password_manager/login_db_v19.sql » ('j') | no next file with comments »
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 ae2822c852fcd2076be3449bbdd045266e213e2c..744ab9afee6cf5618ee931bf847963172d24396a 100644

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

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

@@ -47,7 +47,6 @@

using autofill::FieldPropertiesFlags;

using autofill::FieldPropertiesMask;

using autofill::PasswordForm;

-using autofill::PossibleUsernamePair;

using base::ASCIIToUTF16;

using ::testing::_;

using ::testing::IsEmpty;

@@ -344,8 +343,8 @@

saved_match_.preferred = true;

saved_match_.username_value = ASCIIToUTF16("test@gmail.com");

saved_match_.password_value = ASCIIToUTF16("test1");

- saved_match_.other_possible_usernames.push_back(PossibleUsernamePair(

- ASCIIToUTF16("test2@gmail.com"), ASCIIToUTF16("full_name")));

+ saved_match_.other_possible_usernames.push_back(

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

psl_saved_match_ = saved_match_;

psl_saved_match_.is_public_suffix_match = true;

@@ -415,7 +414,15 @@

autofill::ServerFieldTypeSet expected_available_field_types;

FieldTypeMap expected_types;

expected_types[ASCIIToUTF16("full_name")] = autofill::UNKNOWN_TYPE;

- expected_types[match.username_element] = autofill::UNKNOWN_TYPE;

+ // When we're voting for an account creation form, we should also vote

+ // for its username field.

+ if (field_type && *field_type == autofill::ACCOUNT_CREATION_PASSWORD) {

+ expected_types[match.username_element] = autofill::USERNAME;

+ expected_available_field_types.insert(autofill::USERNAME);

+ } else {

+ expected_types[match.username_element] = autofill::UNKNOWN_TYPE;

+ }

bool expect_generation_vote = false;

if (field_type) {

@@ -947,6 +954,7 @@

PasswordForm actual_saved_form;

autofill::ServerFieldTypeSet expected_available_field_types;

+ expected_available_field_types.insert(autofill::USERNAME);

expected_available_field_types.insert(autofill::ACCOUNT_CREATION_PASSWORD);

EXPECT_CALL(

*client()->mock_driver()->mock_autofill_download_manager(),

@@ -1178,8 +1186,7 @@

PasswordForm saved_form = *saved_match();

saved_form.other_possible_usernames.push_back(

- PossibleUsernamePair(ASCIIToUTF16("other_possible@gmail.com"),

- ASCIIToUTF16("other_username")));

+ ASCIIToUTF16("other_possible@gmail.com"));

fake_form_fetcher()->SetNonFederated({&saved_form}, 0u);

@@ -1214,8 +1221,8 @@

TEST_F(PasswordFormManagerTest, TestAlternateUsername_OtherUsername) {

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

- const PossibleUsernamePair kOtherUsername(

- ASCIIToUTF16("other_possible@gmail.com"), ASCIIToUTF16("other_username"));

+ const base::string16 kOtherUsername =

+ ASCIIToUTF16("other_possible@gmail.com");

PasswordForm saved_form = *saved_match();

saved_form.other_possible_usernames.push_back(kOtherUsername);

@@ -1224,7 +1231,7 @@

// The user chooses an alternative username.

PasswordForm login(*observed_form());

- login.username_value = kOtherUsername.first;

+ login.username_value = kOtherUsername;

form_manager()->ProvisionallySave(

@@ -1242,7 +1249,7 @@

// |other_possible_usernames| should also be empty, but username_value should

// be changed to match |new_username|.

- EXPECT_EQ(kOtherUsername.first, saved_result.username_value);

+ EXPECT_EQ(kOtherUsername, saved_result.username_value);

EXPECT_TRUE(saved_result.other_possible_usernames.empty());

}

@@ -1344,16 +1351,14 @@

}

TEST_F(PasswordFormManagerTest, TestSanitizePossibleUsernames) {

- const PossibleUsernamePair kUsernameOther(ASCIIToUTF16("other username"),

- ASCIIToUTF16("other_username_id"));

+ const base::string16 kUsernameOther = ASCIIToUTF16("other username");

fake_form_fetcher()->SetNonFederated(std::vector<const PasswordForm*>(), 0u);

PasswordForm credentials(*observed_form());

+ credentials.other_possible_usernames.push_back(ASCIIToUTF16("543-43-1234"));

credentials.other_possible_usernames.push_back(

- PossibleUsernamePair(ASCIIToUTF16("543-43-1234"), ASCIIToUTF16("id1")));

- credentials.other_possible_usernames.push_back(PossibleUsernamePair(

- ASCIIToUTF16("378282246310005"), ASCIIToUTF16("id2")));

+ ASCIIToUTF16("378282246310005"));

credentials.other_possible_usernames.push_back(kUsernameOther);

credentials.username_value = ASCIIToUTF16("test@gmail.com");

credentials.preferred = true;

@@ -1374,24 +1379,19 @@

}

TEST_F(PasswordFormManagerTest, TestSanitizePossibleUsernamesDuplicates) {

- const PossibleUsernamePair kUsernameSsn(ASCIIToUTF16("511-32-9830"),

- ASCIIToUTF16("ssn_id"));

- const PossibleUsernamePair kUsernameEmail(ASCIIToUTF16("test@gmail.com"),

- ASCIIToUTF16("email_id"));

- const PossibleUsernamePair kUsernameDuplicate(ASCIIToUTF16("duplicate"),

- ASCIIToUTF16("duplicate_id"));

- const PossibleUsernamePair kUsernameRandom(ASCIIToUTF16("random"),

- ASCIIToUTF16("random_id"));

+ const base::string16 kUsernameEmail = ASCIIToUTF16("test@gmail.com");

+ const base::string16 kUsernameDuplicate = ASCIIToUTF16("duplicate");

+ const base::string16 kUsernameRandom = ASCIIToUTF16("random");

fake_form_fetcher()->SetNonFederated(std::vector<const PasswordForm*>(), 0u);

PasswordForm credentials(*observed_form());

- credentials.other_possible_usernames.push_back(kUsernameSsn);

+ credentials.other_possible_usernames.push_back(ASCIIToUTF16("511-32-9830"));

credentials.other_possible_usernames.push_back(kUsernameDuplicate);

credentials.other_possible_usernames.push_back(kUsernameRandom);

credentials.other_possible_usernames.push_back(kUsernameEmail);

- credentials.username_value = kUsernameEmail.first;

+ credentials.username_value = kUsernameEmail;

credentials.preferred = true;

// Pass in ALLOW_OTHER_POSSIBLE_USERNAMES, although it will not make a

@@ -2920,49 +2920,6 @@

form_manager()->DoesManage(submitted_form, client()->driver().get()));

}

-TEST_F(PasswordFormManagerTest, UploadUsernameCorrectionVote) {

- // Observed and saved forms have the same password, but different usernames.

- PasswordForm new_login(*observed_form());

- new_login.username_value = saved_match()->other_possible_usernames[0].first;

- new_login.password_value = saved_match()->password_value;

- fake_form_fetcher()->SetNonFederated({saved_match()}, 0u);

- form_manager()->ProvisionallySave(

- new_login, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);

- // No match found (because usernames are different).

- EXPECT_TRUE(form_manager()->IsNewLogin());

- // Checks the username correction vote is saved.

- PasswordForm expected_username_vote(*saved_match());

- expected_username_vote.username_element =

- saved_match()->other_possible_usernames[0].second;

- // Checks the upload.

- autofill::ServerFieldTypeSet expected_available_field_types;

- expected_available_field_types.insert(autofill::USERNAME);

- expected_available_field_types.insert(autofill::ACCOUNT_CREATION_PASSWORD);

- FormStructure expected_upload(expected_username_vote.form_data);

- std::string expected_login_signature =

- FormStructure(form_manager()->observed_form().form_data)

- .FormSignatureAsStr();

- std::map<base::string16, autofill::ServerFieldType> expected_types;

- expected_types[expected_username_vote.username_element] = autofill::USERNAME;

- expected_types[expected_username_vote.password_element] =

- autofill::ACCOUNT_CREATION_PASSWORD;

- expected_types[ASCIIToUTF16("Email")] = autofill::UNKNOWN_TYPE;

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

- StartUploadRequest(CheckUploadedAutofillTypesAndSignature(

- expected_upload.FormSignatureAsStr(),

- expected_types, false),

- false, expected_available_field_types,

- expected_login_signature, true));

- form_manager()->Save();

// Test that ResetStoredMatches removes references to previously fetched store

// results.

TEST_F(PasswordFormManagerTest, ResetStoredMatches) {