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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1445383003: Introduce PasswordsModelDelegate as an abstraction between ManagePasswordsBubbleModel and ManagePas… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Mac Created 5 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
« chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc ('k') | chrome/browser/ui/passwords/passwords_model_delegate.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_ui_controller_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 0a4fa82c4db49bf6a8846b525618ec891c992132..25f6dc3b97341d0c4a7e8e45d5f36e084818a9bc 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -111,7 +111,7 @@ void TestManagePasswordsUIController::
void TestManagePasswordsUIController::NeverSavePasswordInternal() {
autofill::PasswordForm blacklisted;
- blacklisted.origin = this->origin();
+ blacklisted.origin = this->GetOrigin();
blacklisted.signon_realm = blacklisted.origin.spec();
blacklisted.blacklisted_by_user = true;
password_manager::PasswordStoreChange change(
@@ -169,7 +169,7 @@ class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
void ExpectIconAndControllerStateIs(password_manager::ui::State state) {
ExpectIconStateIs(state);
- EXPECT_EQ(state, controller()->state());
+ EXPECT_EQ(state, controller()->GetState());
}
autofill::PasswordForm& test_local_form() { return test_local_form_; }
@@ -226,9 +226,8 @@ ManagePasswordsUIControllerTest::CreateFormManager() {
}
TEST_F(ManagePasswordsUIControllerTest, DefaultState) {
- EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
- EXPECT_FALSE(controller()->PasswordPendingUserDecision());
- EXPECT_EQ(GURL::EmptyGURL(), controller()->origin());
+ EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
+ EXPECT_EQ(GURL::EmptyGURL(), controller()->GetOrigin());
ExpectIconStateIs(password_manager::ui::INACTIVE_STATE);
}
@@ -242,9 +241,8 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) {
map.insert(kTestUsername, test_form.Pass());
controller()->OnPasswordAutofilled(map, map.begin()->second->origin);
- EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
- EXPECT_FALSE(controller()->PasswordPendingUserDecision());
- EXPECT_EQ(test_form_ptr->origin, controller()->origin());
+ EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
+ EXPECT_EQ(test_form_ptr->origin, controller()->GetOrigin());
ASSERT_EQ(1u, controller()->GetCurrentForms().size());
EXPECT_EQ(kTestUsername, controller()->GetCurrentForms()[0]->username_value);
@@ -259,14 +257,13 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmitted) {
CreateFormManager());
controller()->OnPasswordSubmitted(test_form_manager.Pass());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
- controller()->state());
- EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+ controller()->GetState());
EXPECT_TRUE(controller()->opened_bubble());
// TODO(mkwst): This should be the value of test_local_form().origin, but
// it's being masked by the stub implementation of
// ManagePasswordsUIControllerMock::PendingCredentials.
- EXPECT_EQ(GURL::EmptyGURL(), controller()->origin());
+ EXPECT_EQ(GURL::EmptyGURL(), controller()->GetOrigin());
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
}
@@ -283,8 +280,7 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedFormPasswordSubmitted) {
controller()->OnPasswordSubmitted(test_form_manager.Pass());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
- controller()->state());
- EXPECT_TRUE(controller()->PasswordPendingUserDecision());
+ controller()->GetState());
EXPECT_FALSE(controller()->opened_bubble());
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_STATE);
@@ -356,13 +352,12 @@ TEST_F(ManagePasswordsUIControllerTest, PasswordSubmittedToNonWebbyURL) {
scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
CreateFormManager());
controller()->OnPasswordSubmitted(test_form_manager.Pass());
- EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
- EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+ EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
// TODO(mkwst): This should be the value of test_local_form().origin, but
// it's being masked by the stub implementation of
// ManagePasswordsUIControllerMock::PendingCredentials.
- EXPECT_EQ(GURL::EmptyGURL(), controller()->origin());
+ EXPECT_EQ(GURL::EmptyGURL(), controller()->GetOrigin());
ExpectIconStateIs(password_manager::ui::INACTIVE_STATE);
}
@@ -380,8 +375,8 @@ TEST_F(ManagePasswordsUIControllerTest, BlacklistedElsewhere) {
password_manager::PasswordStoreChangeList list(1, change);
controller()->OnLoginsChanged(list);
- EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
- EXPECT_EQ(test_local_form().origin, controller()->origin());
+ EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
+ EXPECT_EQ(test_local_form().origin, controller()->GetOrigin());
ExpectIconStateIs(password_manager::ui::MANAGE_STATE);
}
@@ -391,7 +386,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutomaticPasswordSave) {
CreateFormManager());
controller()->OnAutomaticPasswordSave(test_form_manager.Pass());
- EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, controller()->GetState());
controller()->OnBubbleHidden();
ExpectIconStateIs(password_manager::ui::MANAGE_STATE);
@@ -407,9 +402,8 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
- controller()->state());
- EXPECT_FALSE(controller()->PasswordPendingUserDecision());
- EXPECT_EQ(origin, controller()->origin());
+ controller()->GetState());
+ EXPECT_EQ(origin, controller()->GetOrigin());
EXPECT_THAT(controller()->GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
@@ -419,7 +413,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {
test_local_form(),
password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
controller()->OnBubbleHidden();
- EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
ASSERT_TRUE(credential_info());
EXPECT_EQ(test_local_form().username_value, credential_info()->id);
EXPECT_EQ(test_local_form().password_value, credential_info()->password);
@@ -439,9 +433,8 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocalButFederated) {
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
- controller()->state());
- EXPECT_FALSE(controller()->PasswordPendingUserDecision());
- EXPECT_EQ(origin, controller()->origin());
+ controller()->GetState());
+ EXPECT_EQ(origin, controller()->GetOrigin());
EXPECT_THAT(controller()->GetCurrentForms(),
ElementsAre(Pointee(test_federated_form())));
@@ -451,7 +444,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocalButFederated) {
test_federated_form(),
password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
controller()->OnBubbleHidden();
- EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
ASSERT_TRUE(credential_info());
EXPECT_EQ(test_federated_form().username_value, credential_info()->id);
EXPECT_EQ(test_federated_form().federation_url,
@@ -472,10 +465,9 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialFederated) {
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
- controller()->state());
- EXPECT_FALSE(controller()->PasswordPendingUserDecision());
+ controller()->GetState());
EXPECT_EQ(0u, controller()->GetCurrentForms().size());
- EXPECT_EQ(origin, controller()->origin());
+ EXPECT_EQ(origin, controller()->GetOrigin());
ExpectIconStateIs(password_manager::ui::CREDENTIAL_REQUEST_STATE);
@@ -483,7 +475,7 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialFederated) {
test_local_form(),
password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED);
controller()->OnBubbleHidden();
- EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
ASSERT_TRUE(credential_info());
EXPECT_EQ(test_local_form().username_value, credential_info()->id);
EXPECT_TRUE(credential_info()->password.empty());
@@ -501,13 +493,13 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
- controller()->state());
- EXPECT_EQ(origin, controller()->origin());
+ controller()->GetState());
+ EXPECT_EQ(origin, controller()->GetOrigin());
controller()->ManagePasswordsUIController::ChooseCredential(
test_local_form(),
password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
controller()->OnBubbleHidden();
- EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->GetState());
ASSERT_TRUE(credential_info());
EXPECT_TRUE(credential_info()->federation.is_empty());
EXPECT_TRUE(credential_info()->password.empty());
@@ -519,8 +511,8 @@ TEST_F(ManagePasswordsUIControllerTest, AutoSignin) {
ScopedVector<autofill::PasswordForm> local_credentials;
local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
controller()->OnAutoSignin(local_credentials.Pass());
- EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->state());
- EXPECT_EQ(test_local_form().origin, controller()->origin());
+ EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, controller()->GetState());
+ EXPECT_EQ(test_local_form().origin, controller()->GetOrigin());
ASSERT_FALSE(controller()->GetCurrentForms().empty());
EXPECT_EQ(test_local_form(), *controller()->GetCurrentForms()[0]);
ExpectIconStateIs(password_manager::ui::AUTO_SIGNIN_STATE);
@@ -552,7 +544,7 @@ TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
map.insert(kTestUsername, psl_matched_test_form.Pass());
controller()->OnPasswordAutofilled(map, map.begin()->second->origin);
- EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
}
TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) {
@@ -560,7 +552,7 @@ TEST_F(ManagePasswordsUIControllerTest, UpdatePasswordSubmitted) {
CreateFormManager());
controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
- controller()->state());
+ controller()->GetState());
ExpectIconStateIs(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE);
}
@@ -583,14 +575,14 @@ TEST_F(ManagePasswordsUIControllerTest, NavigationWhenUpdateBubbleActive) {
CreateFormManager());
controller()->OnUpdatePasswordSubmitted(test_form_manager.Pass());
EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
- controller()->state());
+ controller()->GetState());
// Fake-navigate after 5 seconds. We expect the bubble's state to be reset
// if a navigation occurs after this limit.
controller()->SetElapsed(
base::TimeDelta::FromMilliseconds(kSlowNavigationDelayInMS));
controller()->DidNavigateMainFrame(content::LoadCommittedDetails(),
content::FrameNavigateParams());
- EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
+ EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
// The following line shouldn't crash browser.
controller()->OnNoInteractionOnUpdate();
}
« chrome/browser/ui/passwords/manage_passwords_ui_controller.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.cc ('k') | chrome/browser/ui/passwords/passwords_model_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698