Don't show any password manager icon when a user visits a blacklisted site.

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/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Contains;
 using ::testing::ElementsAre;
 using ::testing::IsEmpty;
 using ::testing::Not;
 using ::testing::Pointee;
 using ::testing::UnorderedElementsAre;
 
 namespace {
 
 class ManagePasswordsStateTest : public testing::Test {
  public:
-  ManagePasswordsStateTest() = default;
-
   void SetUp() override {
     test_local_form_.origin = GURL("http://example.com");
     test_local_form_.username_value = base::ASCIIToUTF16("username");
     test_local_form_.password_value = base::ASCIIToUTF16("12345");
 
     test_submitted_form_ = test_local_form_;
     test_submitted_form_.username_value = base::ASCIIToUTF16("new one");
     test_submitted_form_.password_value = base::ASCIIToUTF16("asdfjkl;");
 
     test_federated_form_.origin = GURL("https://idp.com");
@@ skipping 20 matching lines @@
   MOCK_METHOD1(OnChooseCredential,
                void(const password_manager::CredentialInfo&));
 
  private:
   password_manager::StubPasswordManagerClient client_;
 
   ManagePasswordsState passwords_data_;
   autofill::PasswordForm test_local_form_;
   autofill::PasswordForm test_submitted_form_;
   autofill::PasswordForm test_federated_form_;
-
-  DISALLOW_COPY_AND_ASSIGN(ManagePasswordsStateTest);
 };
 
 scoped_ptr<password_manager::PasswordFormManager>
 ManagePasswordsStateTest::CreateFormManager() {
   scoped_ptr<password_manager::PasswordFormManager> test_form_manager(
       new password_manager::PasswordFormManager(
           nullptr, &client_,
           base::WeakPtr<password_manager::PasswordManagerDriver>(),
           test_local_form(), false));
   test_form_manager->SimulateFetchMatchingLoginsFromPasswordStore();
@@ skipping 270 matching lines @@
       make_scoped_ptr(new autofill::PasswordForm(psl_matched_test_form)));
   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) {
-  scoped_ptr<autofill::PasswordForm> blacklisted(new autofill::PasswordForm);
-  autofill::PasswordForm& blacklisted_ref = *blacklisted;
-  blacklisted_ref.blacklisted_by_user = true;
-  blacklisted_ref.origin = GURL("http://example.com/bad");
-  autofill::PasswordFormMap password_form_map;
-  password_form_map.insert(blacklisted_ref.username_value, blacklisted.Pass());
-  scoped_ptr<autofill::PasswordForm> test_form(
-      new autofill::PasswordForm(test_local_form()));
-  autofill::PasswordForm* test_form_ptr = test_form.get();
-  password_form_map.insert(test_form_ptr->username_value, test_form.Pass());
-  passwords_data().OnBlacklistBlockedAutofill(password_form_map);
-
-  EXPECT_THAT(passwords_data().GetCurrentForms(),
-              ElementsAre(Pointee(blacklisted_ref), Pointee(*test_form_ptr)));
-  EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
-  EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
-  EXPECT_EQ(blacklisted_ref.origin, passwords_data().origin());
-
-  // |passwords_data| should hold a separate copy of test_form.
-  EXPECT_THAT(passwords_data().GetCurrentForms(), Not(Contains(test_form_ptr)));
-  TestAllUpdates();
-}
-
-TEST_F(ManagePasswordsStateTest, Unblacklist) {
-  scoped_ptr<autofill::PasswordForm> blacklisted(new autofill::PasswordForm);
-  autofill::PasswordForm& blacklisted_ref = *blacklisted;
-  blacklisted_ref.blacklisted_by_user = true;
-  blacklisted_ref.origin = test_local_form().origin;
-  autofill::PasswordFormMap password_form_map;
-  password_form_map.insert(blacklisted_ref.username_value, blacklisted.Pass());
-  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(blacklisted_ref)));
-  EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
-  EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
-  EXPECT_EQ(blacklisted_ref.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());
   EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
             passwords_data().state());
   passwords_data().OnInactive();
@@ skipping 176 matching lines @@
       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.insert(
-      test_local_form().username_value,
-      make_scoped_ptr(new autofill::PasswordForm(test_local_form())));
-  scoped_ptr<autofill::PasswordForm> blacklisted(new autofill::PasswordForm);
-  autofill::PasswordForm& blacklisted_ref = *blacklisted;
-  blacklisted_ref.blacklisted_by_user = true;
-  blacklisted_ref.origin = GURL("http://example.com/bad");
-  password_form_map.insert(blacklisted_ref.username_value, blacklisted.Pass());
-  passwords_data().OnBlacklistBlockedAutofill(password_form_map);
+  // Start in PENDING_PASSWORD_STATE and transit to the blacklisted state.
+  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());
+
+  // Push the balcklisted form.
+  autofill::PasswordForm blacklisted = test_local_form();
+  blacklisted.blacklisted_by_user = true;
+  blacklisted.username_value = base::string16();
+  blacklisted.password_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)));
+  EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
   EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
-  EXPECT_EQ(blacklisted_ref.origin, passwords_data().origin());
+  EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
 
   // Delete the blacklisted form.
-  password_manager::PasswordStoreChangeList list;
-  list.push_back(password_manager::PasswordStoreChange(
-      password_manager::PasswordStoreChange::REMOVE, blacklisted_ref));
+  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(blacklisted_ref.origin, passwords_data().origin());
+  EXPECT_EQ(test_submitted_form().origin, passwords_data().origin());
 }
 
 }  // namespace