Index: chrome/browser/password_manager/password_store_mac_unittest.cc |
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc |
index ee95d538b7d3c0377984c0e85d83a7a33156f6c1..01ff2c3e919e55f06d99348f76b4c7698a5a834b 100644 |
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc |
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc |
@@ -24,6 +24,7 @@ |
#include "components/os_crypt/os_crypt_mocker.h" |
#include "components/password_manager/core/browser/login_database.h" |
#include "components/password_manager/core/browser/password_manager_test_utils.h" |
+#include "components/password_manager/core/browser/password_manager_util.h" |
#include "components/password_manager/core/browser/password_store_consumer.h" |
#include "components/password_manager/core/browser/password_store_origin_unittest.h" |
#include "content/public/test/test_browser_thread.h" |
@@ -2002,7 +2003,7 @@ TEST_F(PasswordStoreMacTest, ImportFromKeychain) { |
ASSERT_TRUE(base::PostTaskAndReplyWithResult( |
thread_->task_runner().get(), FROM_HERE, |
- base::Bind(&PasswordStoreMac::ImportFromKeychain, store()), |
+ base::Bind(&PasswordStoreMac::ImportFromKeychain, login_db(), keychain()), |
base::Bind(&CheckMigrationResult, PasswordStoreMac::MIGRATION_OK))); |
FinishAsyncProcessing(); |
@@ -2043,7 +2044,7 @@ TEST_F(PasswordStoreMacTest, ImportFederatedFromLockedKeychain) { |
FinishAsyncProcessing(); |
ASSERT_TRUE(base::PostTaskAndReplyWithResult( |
thread_->task_runner().get(), FROM_HERE, |
- base::Bind(&PasswordStoreMac::ImportFromKeychain, store()), |
+ base::Bind(&PasswordStoreMac::ImportFromKeychain, login_db(), keychain()), |
base::Bind(&CheckMigrationResult, PasswordStoreMac::MIGRATION_OK))); |
FinishAsyncProcessing(); |
@@ -2075,23 +2076,45 @@ TEST_F(PasswordStoreMacTest, ImportFromLockedKeychainError) { |
keychain()->set_locked(true); |
ASSERT_TRUE(base::PostTaskAndReplyWithResult( |
thread_->task_runner().get(), FROM_HERE, |
- base::Bind(&PasswordStoreMac::ImportFromKeychain, store()), |
- base::Bind(&CheckMigrationResult, PasswordStoreMac::KEYCHAIN_BLOCKED))); |
+ base::Bind(&PasswordStoreMac::ImportFromKeychain, login_db(), keychain()), |
+ base::Bind(&CheckMigrationResult, PasswordStoreMac::MIGRATION_PARTIAL))); |
FinishAsyncProcessing(); |
std::vector<std::unique_ptr<PasswordForm>> matching_items; |
EXPECT_TRUE( |
login_db()->GetLogins(PasswordStore::FormDigest(form1), &matching_items)); |
- ASSERT_EQ(1u, matching_items.size()); |
- EXPECT_EQ(base::string16(), matching_items[0]->password_value); |
+ EXPECT_EQ(0u, matching_items.size()); |
histogram_tester_->ExpectUniqueSample( |
"PasswordManager.KeychainMigration.NumPasswordsOnFailure", 1, 1); |
histogram_tester_->ExpectUniqueSample( |
"PasswordManager.KeychainMigration.NumFailedPasswords", 1, 1); |
- histogram_tester_->ExpectUniqueSample( |
- "PasswordManager.KeychainMigration.NumChromeOwnedInaccessiblePasswords", |
- 2, 1); |
// Don't test the encryption key access. |
histogram_tester_.reset(); |
} |
+ |
+// Delete the Chrome-owned password from the Keychain. |
+TEST_F(PasswordStoreMacTest, CleanUpKeychain) { |
+ MockAppleKeychain::KeychainTestData data1 = { kSecAuthenticationTypeHTMLForm, |
+ "some.domain.com", kSecProtocolTypeHTTP, NULL, 0, NULL, "20020601171500Z", |
+ "joe_user", "sekrit", false}; |
+ keychain()->AddTestItem(data1); |
+ |
+ MacKeychainPasswordFormAdapter keychain_adapter(keychain()); |
+ PasswordFormData data2 = { PasswordForm::SCHEME_HTML, "http://web.site.com/", |
+ "http://web.site.com/path/to/page.html", NULL, NULL, NULL, NULL, |
+ L"anonymous", L"knock-knock", false, 0 }; |
+ keychain_adapter.AddPassword(*CreatePasswordFormFromDataForTesting(data2)); |
+ std::vector<std::unique_ptr<autofill::PasswordForm>> passwords = |
+ password_manager_util::ConvertScopedVector( |
+ keychain_adapter.GetAllPasswordFormPasswords()); |
+ EXPECT_EQ(2u, passwords.size()); |
+ |
+ // Delete everyhting but only the Chrome-owned item should be affected. |
+ PasswordStoreMac::CleanUpKeychain(keychain(), passwords); |
+ passwords = password_manager_util::ConvertScopedVector( |
+ keychain_adapter.GetAllPasswordFormPasswords()); |
+ ASSERT_EQ(1u, passwords.size()); |
+ EXPECT_EQ("http://some.domain.com/", passwords[0]->signon_realm); |
+ EXPECT_EQ(ASCIIToUTF16("sekrit"), passwords[0]->password_value); |
+} |