Stop using the Keychain for passwords finally and clean up the Chrome entries there.

chrome/browser/password_manager/password_store_mac_unittest.cc

 // Copyright (c) 2012 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/password_manager/password_store_mac.h"
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/histogram_tester.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/password_manager/password_store_mac_internal.h"
 #include "chrome/common/chrome_paths.h"
 #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"
 #include "content/public/test/test_utils.h"
 #include "crypto/mock_apple_keychain.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/origin.h"
 
 using autofill::PasswordForm;
@@ skipping 1958 matching lines @@
   blacklisted_form.signon_realm = "http://badsite.com/";
   blacklisted_form.blacklisted_by_user = true;
 
   store()->AddLogin(form1);
   store()->AddLogin(form2);
   store()->AddLogin(blacklisted_form);
   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();
 
   // The password should be stored in the database by now.
   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(form1, *matching_items[0]);
 
@@ skipping 20 matching lines @@
   PasswordForm form1;
   form1.origin = GURL("http://example.com/Login");
   form1.signon_realm = "http://example.com/";
   form1.username_value = ASCIIToUTF16("my_username");
   form1.federation_origin = url::Origin(GURL("https://accounts.google.com/"));
 
   store()->AddLogin(form1);
   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();
 
   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(form1, *matching_items[0]);
 }
 
@@ skipping 11 matching lines @@
   // Add a second keychain item matching the Database entry.
   PasswordForm form2 = form1;
   form2.origin = GURL("http://accounts.google.com/Login");
   form2.password_value = ASCIIToUTF16("1234");
   MacKeychainPasswordFormAdapter adapter(keychain());
   EXPECT_TRUE(adapter.AddPassword(form2));
 
   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);
+}