Stop password migration from the Keychain on Mac.

chrome/browser/password_manager/password_store_proxy_mac.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 <string>
 #include <utility>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 69 matching lines @@
 void PasswordStoreProxyMac::InitOnBackgroundThread(MigrationStatus status) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
   if (!login_metadata_db_->Init()) {
     login_metadata_db_.reset();
     LOG(ERROR) << "Could not create/open login database.";
   }
 
   if (login_metadata_db_ && (status == MigrationStatus::NOT_STARTED ||
                              status == MigrationStatus::FAILED_ONCE ||
                              status == MigrationStatus::FAILED_TWICE)) {
-    // Let's try to migrate the passwords.
-    login_metadata_db_->set_clear_password_values(true);
-    auto import_status =
-        PasswordStoreMac::ImportFromKeychain(login_metadata_db_.get(),
-                                             keychain_.get());
-    if (import_status == PasswordStoreMac::MIGRATION_OK) {
-      status = MigrationStatus::MIGRATED;
-    } else if (import_status == PasswordStoreMac::MIGRATION_PARTIAL) {
-      status = MigrationStatus::MIGRATED_PARTIALLY;
-    } else {
-      login_metadata_db_.reset();
-    }
+    // Migration isn't possible due to Chrome changing the certificate. Just
+    // drop the entries in the DB because they don't have passwords anyway.
+    login_metadata_db_->RemoveLoginsCreatedBetween(base::Time(), base::Time());
+    status = MigrationStatus::MIGRATION_STOPPED;
     pending_ui_tasks_.push_back(
         base::Bind(&PasswordStoreProxyMac::UpdateStatusPref, this, status));
   } else if (login_metadata_db_ && status == MigrationStatus::MIGRATED) {
     // Delete the migrated passwords from the keychain.
     std::vector<std::unique_ptr<autofill::PasswordForm>> forms;
     if (login_metadata_db_->GetAutofillableLogins(&forms)) {
       PasswordStoreMac::CleanUpKeychain(keychain_.get(), forms);
       status = MigrationStatus::MIGRATED_DELETED;
       pending_ui_tasks_.push_back(
           base::Bind(&PasswordStoreProxyMac::UpdateStatusPref, this, status));
@@ skipping 105 matching lines @@
 
 std::vector<password_manager::InteractionsStats>
 PasswordStoreProxyMac::GetAllSiteStatsImpl() {
   return GetBackend()->GetAllSiteStatsImpl();
 }
 
 std::vector<password_manager::InteractionsStats>
 PasswordStoreProxyMac::GetSiteStatsImpl(const GURL& origin_domain) {
   return GetBackend()->GetSiteStatsImpl(origin_domain);
 }