Stop password migration from the Keychain on Mac.

chrome/browser/password_manager/password_store_proxy_mac_unittest.cc

Index: chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
index 5df76b0b0036b8d785fa8815ea22cfa9b1c77120..55090fdbb1b365c28923024face63ac99a58608f 100644
--- a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
@@ -211,8 +211,7 @@ MigrationStatus PasswordStoreProxyMacTest::GetTargetStatus(
   if (GetParam() == MigrationStatus::NOT_STARTED ||
       GetParam() == MigrationStatus::FAILED_ONCE ||
       GetParam() == MigrationStatus::FAILED_TWICE) {
-    return keychain_locked ? MigrationStatus::MIGRATED_PARTIALLY
-                           : MigrationStatus::MIGRATED;
+    return MigrationStatus::MIGRATION_STOPPED;
   }
   if (GetParam() == MigrationStatus::MIGRATED)
     return MigrationStatus::MIGRATED_DELETED;
@@ -432,7 +431,8 @@ INSTANTIATE_TEST_CASE_P(,
                                         MigrationStatus::FAILED_ONCE,
                                         MigrationStatus::FAILED_TWICE,
                                         MigrationStatus::MIGRATED_DELETED,
-                                        MigrationStatus::MIGRATED_PARTIALLY));
+                                        MigrationStatus::MIGRATED_PARTIALLY,
+                                        MigrationStatus::MIGRATION_STOPPED));
 
 // Test the migration process.
 class PasswordStoreProxyMacMigrationTest : public PasswordStoreProxyMacTest {
@@ -486,7 +486,7 @@ void PasswordStoreProxyMacMigrationTest::TestMigration(bool lock_keychain) {
   MockPasswordStoreConsumer mock_consumer;
   store()->GetLogins(PasswordStore::FormDigest(form), &mock_consumer);
   mock_consumer.WaitForResult();
-  if (before_migration && lock_keychain)
+  if (before_migration)
     EXPECT_THAT(mock_consumer.forms(), IsEmpty());
   else
     EXPECT_THAT(mock_consumer.forms(), ElementsAre(Pointee(form)));
@@ -525,6 +525,7 @@ INSTANTIATE_TEST_CASE_P(,
                                         MigrationStatus::FAILED_ONCE,
                                         MigrationStatus::FAILED_TWICE,
                                         MigrationStatus::MIGRATED_DELETED,
-                                        MigrationStatus::MIGRATED_PARTIALLY));
+                                        MigrationStatus::MIGRATED_PARTIALLY,
+                                        MigrationStatus::MIGRATION_STOPPED));
 
 }  // namespace