Start the migration of passwords from the Keychain.

chrome/browser/password_manager/password_store_mac.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 "chrome/browser/password_manager/password_store_mac_internal.h"
 
 #include <CoreServices/CoreServices.h>
 #include <set>
 #include <string>
@@ skipping 942 matching lines @@
     : password_manager::PasswordStore(main_thread_runner, db_thread_runner),
       keychain_(keychain.Pass()),
       login_metadata_db_(nullptr) {
   DCHECK(keychain_);
 }
 
 PasswordStoreMac::~PasswordStoreMac() {}
 
 void PasswordStoreMac::InitWithTaskRunner(
     scoped_refptr<base::SingleThreadTaskRunner> background_task_runner) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   db_thread_runner_ = background_task_runner;
+  DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
 }
 
 PasswordStoreMac::MigrationResult PasswordStoreMac::ImportFromKeychain() {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
   if (!login_metadata_db_)
     return LOGIN_DB_UNAVAILABLE;
 
   ScopedVector<PasswordForm> database_forms;
   if (!login_metadata_db_->GetAutofillableLogins(&database_forms))
     return LOGIN_DB_FAILURE;
@@ skipping 68 matching lines @@
   // Now all the passwords are available. It's time to update LoginDatabase.
   login_metadata_db_->set_clear_password_values(false);
   for (PasswordForm* form : database_forms)
     login_metadata_db_->UpdateLogin(*form);
   return MIGRATION_OK;
 }
 
 void PasswordStoreMac::set_login_metadata_db(
     password_manager::LoginDatabase* login_db) {
   login_metadata_db_ = login_db;
-  login_metadata_db_->set_clear_password_values(true);
+  if (login_metadata_db_)
+    login_metadata_db_->set_clear_password_values(true);
 }
 
 bool PasswordStoreMac::Init(
     const syncer::SyncableService::StartSyncFlare& flare) {
   // The class should be used inside PasswordStoreProxyMac only.
   NOTREACHED();
   return true;
 }
 
 void PasswordStoreMac::ReportMetricsImpl(const std::string& sync_username,
@@ skipping 260 matching lines @@
   ScopedVector<PasswordForm> forms_with_keychain_entry;
   internal_keychain_helpers::GetPasswordsForForms(*keychain_, &database_forms,
                                                   &forms_with_keychain_entry);
 
   // Clean up any orphaned database entries.
   RemoveDatabaseForms(&database_forms);
 
   // Move the orphaned DB forms to the output parameter.
   AppendSecondToFirst(orphaned_forms, &database_forms);
 }