Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(533)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/passwords/manage_passwords_state_unittest.cc

Issue 2531863002: Delete all the traces of federation providers in the account chooser. (Closed)
Patch Set: android2 Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_ui_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
index f32823bcdf553a0b2ccae39aa51dcce4c16c3b06..13a7ccde9ad56d66582c3c487e30274ab3794b3f 100644
--- a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
@@ -61,9 +61,6 @@ class ManagePasswordsStateTest : public testing::Test {
test_local_federated_form_.signon_realm =
"federation://example.com/accounts.com";
- test_federated_form_.origin = GURL("https://idp.com");
- test_federated_form_.username_value = base::ASCIIToUTF16("username");
-
passwords_data_.set_client(&stub_client_);
}
@@ -72,7 +69,6 @@ class ManagePasswordsStateTest : public testing::Test {
autofill::PasswordForm& test_local_federated_form() {
return test_local_federated_form_;
}
- autofill::PasswordForm& test_federated_form() { return test_federated_form_; }
std::vector<std::unique_ptr<autofill::PasswordForm>>& test_stored_forms() {
return test_stored_forms_;
}
@@ -82,8 +78,8 @@ class ManagePasswordsStateTest : public testing::Test {
// matches.
std::unique_ptr<password_manager::PasswordFormManager> CreateFormManager();
- // Returns a PasswordFormManager containing test_federated_form() as a stored
- // federated credential.
+ // Returns a PasswordFormManager containing test_local_federated_form() as a
+ // stored federated credential.
std::unique_ptr<password_manager::PasswordFormManager>
CreateFormManagerWithFederation();
@@ -112,7 +108,6 @@ class ManagePasswordsStateTest : public testing::Test {
autofill::PasswordForm test_local_form_;
autofill::PasswordForm test_submitted_form_;
autofill::PasswordForm test_local_federated_form_;
- autofill::PasswordForm test_federated_form_;
std::vector<std::unique_ptr<autofill::PasswordForm>> test_stored_forms_;
};
@@ -151,8 +146,6 @@ ManagePasswordsStateTest::CreateFormManagerInternal(bool include_federated) {
void ManagePasswordsStateTest::TestNoisyUpdates() {
const std::vector<const autofill::PasswordForm*> forms =
GetRawPointers(passwords_data_.GetCurrentForms());
- const std::vector<const autofill::PasswordForm*> federated_forms =
- GetRawPointers(passwords_data_.federation_providers_forms());
const password_manager::ui::State state = passwords_data_.state();
const GURL origin = passwords_data_.origin();
@@ -166,8 +159,6 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -177,8 +168,6 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
password_manager::PasswordStoreChange::UPDATE, form);
passwords_data().ProcessLoginsChanged(list);
EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -187,8 +176,6 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
password_manager::PasswordStoreChange::REMOVE, form);
passwords_data().ProcessLoginsChanged(list);
EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
}
@@ -196,8 +183,6 @@ void ManagePasswordsStateTest::TestNoisyUpdates() {
void ManagePasswordsStateTest::TestAllUpdates() {
const std::vector<const autofill::PasswordForm*> forms =
GetRawPointers(passwords_data_.GetCurrentForms());
- const std::vector<const autofill::PasswordForm*> federated_forms =
- GetRawPointers(passwords_data_.federation_providers_forms());
const password_manager::ui::State state = passwords_data_.state();
const GURL origin = passwords_data_.origin();
EXPECT_NE(GURL::EmptyGURL(), origin);
@@ -212,8 +197,6 @@ void ManagePasswordsStateTest::TestAllUpdates() {
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
EXPECT_THAT(passwords_data().GetCurrentForms(), Contains(Pointee(form)));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -223,8 +206,6 @@ void ManagePasswordsStateTest::TestAllUpdates() {
password_manager::PasswordStoreChange::UPDATE, form);
passwords_data().ProcessLoginsChanged(list);
EXPECT_THAT(passwords_data().GetCurrentForms(), Contains(Pointee(form)));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -233,8 +214,6 @@ void ManagePasswordsStateTest::TestAllUpdates() {
password_manager::PasswordStoreChange::REMOVE, form);
passwords_data().ProcessLoginsChanged(list);
EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -244,8 +223,6 @@ void ManagePasswordsStateTest::TestAllUpdates() {
void ManagePasswordsStateTest::TestBlacklistedUpdates() {
const std::vector<const autofill::PasswordForm*> forms =
GetRawPointers(passwords_data_.GetCurrentForms());
- const std::vector<const autofill::PasswordForm*> federated_forms =
- GetRawPointers(passwords_data_.federation_providers_forms());
const password_manager::ui::State state = passwords_data_.state();
const GURL origin = passwords_data_.origin();
EXPECT_NE(GURL::EmptyGURL(), origin);
@@ -259,8 +236,6 @@ void ManagePasswordsStateTest::TestBlacklistedUpdates() {
password_manager::PasswordStoreChange::ADD, blacklisted));
passwords_data().ProcessLoginsChanged(list);
EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -269,15 +244,12 @@ void ManagePasswordsStateTest::TestBlacklistedUpdates() {
password_manager::PasswordStoreChange::REMOVE, blacklisted);
passwords_data().ProcessLoginsChanged(list);
EXPECT_EQ(forms, GetRawPointers(passwords_data().GetCurrentForms()));
- EXPECT_EQ(federated_forms,
- GetRawPointers(passwords_data().federation_providers_forms()));
EXPECT_EQ(state, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
}
TEST_F(ManagePasswordsStateTest, DefaultState) {
EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
EXPECT_FALSE(passwords_data().form_manager());
@@ -297,7 +269,6 @@ TEST_F(ManagePasswordsStateTest, PasswordSubmitted) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -322,7 +293,6 @@ TEST_F(ManagePasswordsStateTest, PasswordSaved) {
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -339,24 +309,17 @@ TEST_F(ManagePasswordsStateTest, PasswordSubmittedFederationsPresent) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_federated_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
}
TEST_F(ManagePasswordsStateTest, OnRequestCredentials) {
std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
- std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials;
- federated_credentials.emplace_back(
- new autofill::PasswordForm(test_federated_form()));
const GURL origin = test_local_form().origin;
- passwords_data().OnRequestCredentials(
- std::move(local_credentials), std::move(federated_credentials), origin);
+ passwords_data().OnRequestCredentials(std::move(local_credentials), origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(),
- ElementsAre(Pointee(test_federated_form())));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -367,7 +330,6 @@ TEST_F(ManagePasswordsStateTest, OnRequestCredentials) {
EXPECT_TRUE(passwords_data().credentials_callback().is_null());
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
TestAllUpdates();
@@ -380,7 +342,6 @@ TEST_F(ManagePasswordsStateTest, AutoSignin) {
test_local_form().origin);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
TestAllUpdates();
@@ -388,7 +349,6 @@ TEST_F(ManagePasswordsStateTest, AutoSignin) {
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
TestAllUpdates();
@@ -412,7 +372,6 @@ TEST_F(ManagePasswordsStateTest, AutomaticPasswordSave) {
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_submitted_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
TestAllUpdates();
@@ -429,7 +388,6 @@ TEST_F(ManagePasswordsStateTest, AutomaticPasswordSaveWithFederations) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
UnorderedElementsAre(Pointee(test_submitted_form()),
Pointee(test_local_federated_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
}
TEST_F(ManagePasswordsStateTest, PasswordAutofilled) {
@@ -441,7 +399,6 @@ TEST_F(ManagePasswordsStateTest, PasswordAutofilled) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -463,7 +420,6 @@ TEST_F(ManagePasswordsStateTest, PasswordAutofillWithSavedFederations) {
UnorderedElementsAre(Pointee(test_local_form()),
Pointee(test_local_federated_form())));
// |federated_credentials_forms()| do not refer to the saved federations.
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
}
@@ -480,7 +436,6 @@ TEST_F(ManagePasswordsStateTest, ActiveOnMixedPSLAndNonPSLMatched) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
@@ -497,7 +452,6 @@ TEST_F(ManagePasswordsStateTest, InactiveOnPSLMatched) {
password_form_map, GURL("https://m.example.com/"), nullptr);
EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
EXPECT_FALSE(passwords_data().form_manager());
@@ -514,7 +468,6 @@ TEST_F(ManagePasswordsStateTest, OnInactive) {
passwords_data().state());
passwords_data().OnInactive();
EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, passwords_data().state());
EXPECT_EQ(GURL::EmptyGURL(), passwords_data().origin());
EXPECT_FALSE(passwords_data().form_manager());
@@ -537,12 +490,8 @@ TEST_F(ManagePasswordsStateTest, PendingPasswordAddBlacklisted) {
TEST_F(ManagePasswordsStateTest, RequestCredentialsAddBlacklisted) {
std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
local_credentials.emplace_back(new autofill::PasswordForm(test_local_form()));
- std::vector<std::unique_ptr<autofill::PasswordForm>> federated_credentials;
- federated_credentials.emplace_back(
- new autofill::PasswordForm(test_federated_form()));
const GURL origin = test_local_form().origin;
- passwords_data().OnRequestCredentials(
- std::move(local_credentials), std::move(federated_credentials), origin);
+ passwords_data().OnRequestCredentials(std::move(local_credentials), origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
@@ -609,7 +558,6 @@ TEST_F(ManagePasswordsStateTest, PasswordUpdateSubmitted) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -636,7 +584,6 @@ TEST_F(ManagePasswordsStateTest, AndroidPasswordUpdateSubmitted) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(android_form)));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
passwords_data().state());
EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
@@ -660,13 +607,11 @@ TEST_F(ManagePasswordsStateTest, PasswordUpdateSubmittedWithFederations) {
EXPECT_THAT(passwords_data().GetCurrentForms(),
UnorderedElementsAre(Pointee(test_local_form()),
Pointee(test_local_federated_form())));
- EXPECT_THAT(passwords_data().federation_providers_forms(), IsEmpty());
}
TEST_F(ManagePasswordsStateTest, ChooseCredentialLocal) {
passwords_data().OnRequestCredentials(
std::vector<std::unique_ptr<autofill::PasswordForm>>(),
- std::vector<std::unique_ptr<autofill::PasswordForm>>(),
test_local_form().origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
@@ -677,13 +622,9 @@ TEST_F(ManagePasswordsStateTest, ChooseCredentialLocal) {
TEST_F(ManagePasswordsStateTest, ChooseCredentialEmpty) {
passwords_data().OnRequestCredentials(
std::vector<std::unique_ptr<autofill::PasswordForm>>(),
- std::vector<std::unique_ptr<autofill::PasswordForm>>(),
test_local_form().origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
- password_manager::CredentialInfo credential_info(
- test_federated_form(),
- password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
EXPECT_CALL(*this, CredentialCallback(nullptr));
passwords_data().ChooseCredential(nullptr);
}
@@ -691,7 +632,6 @@ TEST_F(ManagePasswordsStateTest, ChooseCredentialEmpty) {
TEST_F(ManagePasswordsStateTest, ChooseCredentialLocalWithNonEmptyFederation) {
passwords_data().OnRequestCredentials(
std::vector<std::unique_ptr<autofill::PasswordForm>>(),
- std::vector<std::unique_ptr<autofill::PasswordForm>>(),
test_local_form().origin);
passwords_data().set_credentials_callback(base::Bind(
&ManagePasswordsStateTest::CredentialCallback, base::Unretained(this)));
« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_ui_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698