Stop password migration from the Keychain on Mac.

chrome/browser/password_manager/password_store_proxy_mac_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/password_manager/password_store_proxy_mac.h"
 
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 193 matching lines @@
 
 base::FilePath PasswordStoreProxyMacTest::test_login_db_file_path() const {
   return db_dir_.GetPath().Append(FILE_PATH_LITERAL("login.db"));
 }
 
 MigrationStatus PasswordStoreProxyMacTest::GetTargetStatus(
     bool keychain_locked) const {
   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;
   return GetParam();
 }
 
 void PasswordStoreProxyMacTest::AddForm(const PasswordForm& form) {
   MockPasswordStoreObserver mock_observer(store());
 
   password_manager::PasswordStoreChangeList list;
@@ skipping 199 matching lines @@
   ClosePasswordStore();
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         PasswordStoreProxyMacTest,
                         testing::Values(MigrationStatus::NOT_STARTED,
                                         MigrationStatus::MIGRATED,
                                         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 {
  public:
   void SetUp() override;
 
   void TestMigration(bool lock_keychain);
 
  protected:
   std::unique_ptr<password_manager::LoginDatabase> login_db_;
@@ skipping 33 matching lines @@
     keychain_->set_locked(true);
   store_ = new PasswordStoreProxyMac(
       BrowserThread::GetTaskRunnerForThread(BrowserThread::UI),
       std::move(keychain_), std::move(login_db_), &testing_prefs_);
   ASSERT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
   FinishAsyncProcessing();
 
   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)));
 
   int status = testing_prefs_.GetInteger(
       password_manager::prefs::kKeychainMigrationStatus);
   EXPECT_EQ(static_cast<int>(GetTargetStatus(lock_keychain)), status);
   histogram_tester_.ExpectUniqueSample(
       "PasswordManager.KeychainMigration.Status", status, 1);
   static_cast<crypto::MockAppleKeychain*>(store()->keychain())
@@ skipping 18 matching lines @@
   TestMigration(true);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         PasswordStoreProxyMacMigrationTest,
                         testing::Values(MigrationStatus::NOT_STARTED,
                                         MigrationStatus::MIGRATED,
                                         MigrationStatus::FAILED_ONCE,
                                         MigrationStatus::FAILED_TWICE,
                                         MigrationStatus::MIGRATED_DELETED,
-                                        MigrationStatus::MIGRATED_PARTIALLY));
+                                        MigrationStatus::MIGRATED_PARTIALLY,
+                                        MigrationStatus::MIGRATION_STOPPED));
 
 }  // namespace