Credential Manager API: Showing both local and federated logins.

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

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 c12acc68759f5e375bc362705aa1c57a02db4646..02844a6e700b4a84a0b4f288ab3d013cc4842d4d 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -322,7 +322,7 @@ TEST_F(ManagePasswordsUIControllerTest, AutomaticPasswordSave) {
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state());
 }
 
-TEST_F(ManagePasswordsUIControllerTest, ChooseCredential) {
+TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocal) {
   ScopedVector<autofill::PasswordForm> local_credentials;
   local_credentials.push_back(new autofill::PasswordForm(test_form()));
   ScopedVector<autofill::PasswordForm> federated_credentials;
@@ -341,16 +341,45 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredential) {
   controller()->UpdateIconAndBubbleState(&mock);
   EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state());
 
-  controller()->ManagePasswordsUIController::ChooseCredential(true,
-                                                              test_form());
+  controller()->ManagePasswordsUIController::ChooseCredential(
+      test_form(), password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
   ASSERT_TRUE(credential_info());
   EXPECT_EQ(test_form().username_value, credential_info()->id);
   EXPECT_EQ(test_form().password_value, credential_info()->password);
+  EXPECT_TRUE(credential_info()->federation.is_empty());
   EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL,
             credential_info()->type);
 }
 
+TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialFederated) {
+  ScopedVector<autofill::PasswordForm> local_credentials;
+  local_credentials.push_back(new autofill::PasswordForm(test_form()));

[vasilii, 2015/01/23 15:24:18]

That's strange that you add test_form() here as a local credential. Later it
suddenly becomes selected as a federated one and looses the password.
The form should go to |federated_credentials|.

[melandory, 2015/01/23 15:32:01]

Fixed.

+  ScopedVector<autofill::PasswordForm> federated_credentials;
+  EXPECT_TRUE(controller()->OnChooseCredentials(
+      local_credentials.Pass(), federated_credentials.Pass(),
+      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(autofill::ConstPasswordFormMap(), controller()->best_matches());
+
+  ManagePasswordsIconMock mock;
+  controller()->UpdateIconAndBubbleState(&mock);
+  EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state());
+
+  controller()->ManagePasswordsUIController::ChooseCredential(
+      test_form(), password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED);
+  EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
+  ASSERT_TRUE(credential_info());
+  EXPECT_EQ(test_form().username_value, credential_info()->id);
+  EXPECT_TRUE(credential_info()->password.empty());
+  EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED,
+            credential_info()->type);
+}
+
 TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {
   ScopedVector<autofill::PasswordForm> local_credentials;
   local_credentials.push_back(new autofill::PasswordForm(test_form()));
@@ -363,10 +392,12 @@ TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialCancel) {
   EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE,
             controller()->state());
 
-  controller()->ManagePasswordsUIController::ChooseCredential(false,
-                                                              test_form());
+  controller()->ManagePasswordsUIController::ChooseCredential(
+      test_form(), password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
   ASSERT_TRUE(credential_info());
+  EXPECT_TRUE(credential_info()->federation.is_empty());
+  EXPECT_TRUE(credential_info()->password.empty());
   EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,
             credential_info()->type);
 }