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

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

Issue 877613004: [Credential Manager API] Pass origin to Account chooser UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local_vs_federated
Patch Set: Rebased. Created 5 years, 10 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
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 b91b74b5e7a9bd5f2581545457aa5e6ebab1e190..52a271737ce73d0e98b4e0034064ce273561b70d 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -326,15 +326,15 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {
ScopedVector<autofill::PasswordForm> local_credentials;
local_credentials.push_back(new autofill::PasswordForm(test_form()));
ScopedVector<autofill::PasswordForm> federated_credentials;
+ GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(),
- federated_credentials.Pass(),
+ local_credentials.Pass(), federated_credentials.Pass(), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,
controller()->state());
EXPECT_FALSE(controller()->PasswordPendingUserDecision());
- EXPECT_EQ(test_form().origin, controller()->origin());
+ EXPECT_EQ(origin, controller()->origin());
EXPECT_EQ(autofill::ConstPasswordFormMap(), controller()->best_matches());
ManagePasswordsIconMock mock;
@@ -356,14 +356,16 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialFederated) {
ScopedVector<autofill::PasswordForm> local_credentials;
ScopedVector<autofill::PasswordForm> federated_credentials;
federated_credentials.push_back(new autofill::PasswordForm(test_form()));
+ GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(), federated_credentials.Pass(),
+ local_credentials.Pass(), federated_credentials.Pass(), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,
controller()->state());
EXPECT_FALSE(controller()->PasswordPendingUserDecision());
EXPECT_EQ(autofill::ConstPasswordFormMap(), controller()->best_matches());
+ EXPECT_EQ(origin, controller()->origin());
ManagePasswordsIconMock mock;
controller()->UpdateIconAndBubbleState(&mock);
@@ -383,14 +385,14 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {
ScopedVector<autofill::PasswordForm> local_credentials;
local_credentials.push_back(new autofill::PasswordForm(test_form()));
ScopedVector<autofill::PasswordForm> federated_credentials;
+ GURL origin("http://example.com");
EXPECT_TRUE(controller()->OnChooseCredentials(
- local_credentials.Pass(),
- federated_credentials.Pass(),
+ local_credentials.Pass(), federated_credentials.Pass(), origin,
base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
base::Unretained(this))));
EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,
controller()->state());
-
+ EXPECT_EQ(origin, controller()->origin());
controller()->ManagePasswordsUIController::ChooseCredential(
test_form(), password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());

Powered by Google App Engine
This is Rietveld 408576698