Open the LoginDatabase on the DB thread, not the UI thread.

components/password_manager/core/browser/password_store_default.cc

 // Copyright 2014 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 "components/password_manager/core/browser/password_store_default.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 
 using autofill::PasswordForm;
 
 namespace password_manager {
 
 PasswordStoreDefault::PasswordStoreDefault(
     scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner,
-    LoginDatabase* login_db)
-    : PasswordStore(main_thread_runner, db_thread_runner), login_db_(login_db) {
-  DCHECK(login_db);
+    scoped_ptr<LoginDatabase> login_db)
+    : PasswordStore(main_thread_runner, db_thread_runner),
+      login_db_(login_db.Pass()) {
 }
 
 PasswordStoreDefault::~PasswordStoreDefault() {
 }
 
+bool PasswordStoreDefault::Init(
+    const syncer::SyncableService::StartSyncFlare& flare) {
+  ScheduleTask(base::Bind(&PasswordStoreDefault::InitOnDBThread, this));
+  return PasswordStore::Init(flare);
+}
+
+void PasswordStoreDefault::InitOnDBThread() {
+  DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
+  DCHECK(login_db_);
+  if (!login_db_->Init()) {
+    login_db_.reset();
+    LOG(ERROR) << "Could not create/open login database.";
+  }
+}
+
 void PasswordStoreDefault::ReportMetricsImpl(
     const std::string& sync_username,
     bool custom_passphrase_sync_enabled) {
+  if (!login_db_)
+    return;
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
   login_db_->ReportMetrics(sync_username, custom_passphrase_sync_enabled);
 }
 
 PasswordStoreChangeList PasswordStoreDefault::AddLoginImpl(
     const PasswordForm& form) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
+  if (!login_db_)
+    return PasswordStoreChangeList();
   return login_db_->AddLogin(form);
 }
 
 PasswordStoreChangeList PasswordStoreDefault::UpdateLoginImpl(
     const PasswordForm& form) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
+  if (!login_db_)
+    return PasswordStoreChangeList();
   return login_db_->UpdateLogin(form);
 }
 
 PasswordStoreChangeList PasswordStoreDefault::RemoveLoginImpl(
     const PasswordForm& form) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
   PasswordStoreChangeList changes;
-  if (login_db_->RemoveLogin(form))
+  if (login_db_ && login_db_->RemoveLogin(form))
     changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
   return changes;
 }
 
 PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(
     base::Time delete_begin,
     base::Time delete_end) {
   std::vector<PasswordForm*> forms;
   PasswordStoreChangeList changes;
-  if (login_db_->GetLoginsCreatedBetween(delete_begin, delete_end, &forms)) {
+  if (login_db_ &&
+      login_db_->GetLoginsCreatedBetween(delete_begin, delete_end, &forms)) {
     if (login_db_->RemoveLoginsCreatedBetween(delete_begin, delete_end)) {
       for (std::vector<PasswordForm*>::const_iterator it = forms.begin();
            it != forms.end(); ++it) {
         changes.push_back(
             PasswordStoreChange(PasswordStoreChange::REMOVE, **it));
       }
       LogStatsForBulkDeletion(changes.size());
     }
   }
   STLDeleteElements(&forms);
   return changes;
 }
 
 PasswordStoreChangeList PasswordStoreDefault::RemoveLoginsSyncedBetweenImpl(
     base::Time delete_begin,
     base::Time delete_end) {
   std::vector<PasswordForm*> forms;
   PasswordStoreChangeList changes;
-  if (login_db_->GetLoginsSyncedBetween(delete_begin, delete_end, &forms)) {
+  if (login_db_ &&
+      login_db_->GetLoginsSyncedBetween(delete_begin, delete_end, &forms)) {
     if (login_db_->RemoveLoginsSyncedBetween(delete_begin, delete_end)) {
       for (std::vector<PasswordForm*>::const_iterator it = forms.begin();
            it != forms.end(); ++it) {
         changes.push_back(
             PasswordStoreChange(PasswordStoreChange::REMOVE, **it));
       }
       LogStatsForBulkDeletionDuringRollback(changes.size());
     }
   }
   STLDeleteElements(&forms);
   return changes;
 }
 
 void PasswordStoreDefault::GetLoginsImpl(
     const autofill::PasswordForm& form,
     AuthorizationPromptPolicy prompt_policy,
     const ConsumerCallbackRunner& callback_runner) {
   std::vector<PasswordForm*> matched_forms;
-  login_db_->GetLogins(form, &matched_forms);
+  if (login_db_)
+    login_db_->GetLogins(form, &matched_forms);
   callback_runner.Run(matched_forms);
 }
 
 void PasswordStoreDefault::GetAutofillableLoginsImpl(
     GetLoginsRequest* request) {
   FillAutofillableLogins(request->result());
   ForwardLoginsResult(request);
 }
 
 void PasswordStoreDefault::GetBlacklistLoginsImpl(GetLoginsRequest* request) {
   FillBlacklistLogins(request->result());
   ForwardLoginsResult(request);
 }
 
 bool PasswordStoreDefault::FillAutofillableLogins(
     std::vector<PasswordForm*>* forms) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
-  return login_db_->GetAutofillableLogins(forms);
+  return login_db_ && login_db_->GetAutofillableLogins(forms);
 }
 
 bool PasswordStoreDefault::FillBlacklistLogins(
     std::vector<PasswordForm*>* forms) {
   DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
-  return login_db_->GetBlacklistLogins(forms);
+  return login_db_ && login_db_->GetBlacklistLogins(forms);
 }
 
 }  // namespace password_manager