Integrate ManagePasswordsState into ManagePasswordsUIController.

chrome/browser/ui/passwords/manage_passwords_state_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/passwords/manage_passwords_state.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
@@ skipping 235 matching lines @@
       test_local_form(),
       password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
   EXPECT_CALL(*this, OnChooseCredential(_))
       .WillOnce(testing::SaveArg<0>(&credential_info));
   passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
   EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,
             credential_info.type);
   EXPECT_TRUE(passwords_data().credentials_callback().is_null());
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
-  EXPECT_THAT(passwords_data().federated_credentials_forms(),
-              ElementsAre(Pointee(test_federated_form())));
+  EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
   EXPECT_EQ(origin, passwords_data().origin());
   TestAllUpdates();
 }
 
 TEST_F(ManagePasswordsStateTest, AutoSignin) {
   ScopedVector<autofill::PasswordForm> local_credentials;
   local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
   passwords_data().OnAutoSignin(local_credentials.Pass());
   EXPECT_THAT(passwords_data().GetCurrentForms(),
@@ skipping 79 matching lines @@
   passwords_data().OnPasswordAutofilled(password_form_map);
 
   EXPECT_THAT(passwords_data().GetCurrentForms(), IsEmpty());
   EXPECT_THAT(passwords_data().federated_credentials_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());
 }
 
 TEST_F(ManagePasswordsStateTest, BlacklistBlockedAutofill) {
-  test_local_form().blacklisted_by_user = true;
+  autofill::PasswordForm blacklisted;
+  blacklisted.blacklisted_by_user = true;
+  blacklisted.origin = GURL("http://example.com/bad");
   autofill::PasswordFormMap password_form_map;
+  password_form_map[blacklisted.username_value] = &blacklisted;
   password_form_map[test_local_form().username_value] = &test_local_form();
   passwords_data().OnBlacklistBlockedAutofill(password_form_map);
 
   EXPECT_THAT(passwords_data().GetCurrentForms(),
-              ElementsAre(Pointee(test_local_form())));
+              ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
-  EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+  EXPECT_EQ(blacklisted.origin, passwords_data().origin());
 
   // |passwords_data| should hold a separate copy of test_local_form().
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               Not(Contains(&test_local_form())));
   TestAllUpdates();
 }
 
 TEST_F(ManagePasswordsStateTest, Unblacklist) {
+  autofill::PasswordForm blacklisted;
+  blacklisted.blacklisted_by_user = true;
+  blacklisted.origin = test_local_form().origin;
   autofill::PasswordFormMap password_form_map;
-  password_form_map[test_local_form().username_value] = &test_local_form();
+  password_form_map[blacklisted.username_value] = &blacklisted;
   passwords_data().OnBlacklistBlockedAutofill(password_form_map);
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
   passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
 
   EXPECT_THAT(passwords_data().GetCurrentForms(),
-              ElementsAre(Pointee(test_local_form())));
+              ElementsAre(Pointee(blacklisted)));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
-  EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+  EXPECT_EQ(blacklisted.origin, passwords_data().origin());
   TestAllUpdates();
 }
 
 TEST_F(ManagePasswordsStateTest, OnInactive) {
   scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
       CreateFormManager());
   test_form_manager->ProvisionallySave(
       test_submitted_form(),
       password_manager::PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
   passwords_data().OnPendingPassword(test_form_manager.Pass());
@@ skipping 19 matching lines @@
             passwords_data().state());
 
   // Process the blacklisted form.
   autofill::PasswordForm blacklisted = test_local_form();
   blacklisted.blacklisted_by_user = true;
   blacklisted.username_value = base::string16();
   password_manager::PasswordStoreChangeList list;
   list.push_back(password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::ADD, blacklisted));
   passwords_data().ProcessLoginsChanged(list);
+  EXPECT_THAT(passwords_data().GetCurrentForms(),
+              ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
   EXPECT_EQ(test_local_form().origin, passwords_data().origin());
 
   // Delete the blacklisted form.
   list[0] = password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::REMOVE, blacklisted);
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
@@ skipping 22 matching lines @@
   blacklisted.username_value = base::string16();
   password_manager::PasswordStoreChangeList list;
   list.push_back(password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::ADD, blacklisted));
   password_manager::CredentialInfo credential_info(
       test_local_form(),
       password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
   EXPECT_CALL(*this, OnChooseCredential(_))
       .WillOnce(testing::SaveArg<0>(&credential_info));
   passwords_data().ProcessLoginsChanged(list);
+  EXPECT_THAT(passwords_data().GetCurrentForms(),
+              ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
   EXPECT_EQ(test_local_form().origin, passwords_data().origin());
   EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,
             credential_info.type);
   EXPECT_TRUE(passwords_data().credentials_callback().is_null());
 
   // Delete the blacklisted form.
   list[0] = password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::REMOVE, blacklisted);
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
-  EXPECT_THAT(passwords_data().federated_credentials_forms(),
-              ElementsAre(Pointee(test_federated_form())));
+  EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
   EXPECT_EQ(origin, passwords_data().origin());
 }
 
 TEST_F(ManagePasswordsStateTest, AutoSigninToBlacklisted) {
   ScopedVector<autofill::PasswordForm> local_credentials;
   local_credentials.push_back(new autofill::PasswordForm(test_local_form()));
   passwords_data().OnAutoSignin(local_credentials.Pass());
   EXPECT_EQ(password_manager::ui::AUTO_SIGNIN_STATE, passwords_data().state());
 
   // Process the blacklisted form.
   autofill::PasswordForm blacklisted = test_local_form();
   blacklisted.blacklisted_by_user = true;
   blacklisted.username_value = base::string16();
   password_manager::PasswordStoreChange change(
       password_manager::PasswordStoreChange::ADD, blacklisted);
   password_manager::PasswordStoreChangeList list(1, change);
   passwords_data().ProcessLoginsChanged(list);
+  EXPECT_THAT(passwords_data().GetCurrentForms(),
+              ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
   EXPECT_EQ(test_local_form().origin, passwords_data().origin());
 
   // Delete the blacklisted form.
   list[0] = password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::REMOVE, blacklisted);
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
@@ skipping 11 matching lines @@
   EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, passwords_data().state());
 
   // Process the blacklisted form.
   autofill::PasswordForm blacklisted = test_local_form();
   blacklisted.blacklisted_by_user = true;
   blacklisted.username_value = base::string16();
   password_manager::PasswordStoreChange change(
       password_manager::PasswordStoreChange::ADD, blacklisted);
   password_manager::PasswordStoreChangeList list(1, change);
   passwords_data().ProcessLoginsChanged(list);
+  EXPECT_EQ(*passwords_data().GetCurrentForms()[0], blacklisted);
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
   EXPECT_EQ(test_local_form().origin, passwords_data().origin());
 
   // Delete the blacklisted form.
   list[0] = password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::REMOVE, blacklisted);
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               UnorderedElementsAre(Pointee(test_local_form()),
                                    Pointee(test_submitted_form())));
@@ skipping 10 matching lines @@
 
   // Process the blacklisted form.
   autofill::PasswordForm blacklisted = test_local_form();
   blacklisted.blacklisted_by_user = true;
   blacklisted.username_value = base::string16();
   password_manager::PasswordStoreChange change(
       password_manager::PasswordStoreChange::ADD, blacklisted);
   password_manager::PasswordStoreChangeList list(1, change);
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
-              UnorderedElementsAre(Pointee(test_local_form()),
-                                   Pointee(blacklisted)));
+              ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
   EXPECT_EQ(test_local_form().origin, passwords_data().origin());
 
   // Delete the blacklisted form.
   list[0] = password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::REMOVE, blacklisted);
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
   EXPECT_EQ(test_local_form().origin, passwords_data().origin());
 }
 
 TEST_F(ManagePasswordsStateTest, BlacklistedToAutofilled) {
   autofill::PasswordFormMap password_form_map;
   password_form_map[test_local_form().username_value] = &test_local_form();
+  autofill::PasswordForm blacklisted;
+  blacklisted.blacklisted_by_user = true;
+  blacklisted.origin = GURL("http://example.com/bad");
+  password_form_map[blacklisted.username_value] = &blacklisted;
   passwords_data().OnBlacklistBlockedAutofill(password_form_map);
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
-  EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+  EXPECT_EQ(blacklisted.origin, passwords_data().origin());
 
   // Delete the blacklisted form.
-  autofill::PasswordForm blacklisted = test_local_form();
-  blacklisted.blacklisted_by_user = true;
-  blacklisted.username_value = base::string16();
   password_manager::PasswordStoreChangeList list;
   list.push_back(password_manager::PasswordStoreChange(
       password_manager::PasswordStoreChange::REMOVE, blacklisted));
   passwords_data().ProcessLoginsChanged(list);
   EXPECT_THAT(passwords_data().GetCurrentForms(),
               ElementsAre(Pointee(test_local_form())));
   EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
-  EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+  EXPECT_EQ(blacklisted.origin, passwords_data().origin());
 }
 
 }  // namespace