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

components/password_manager/core/browser/password_store_default.h

 // 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.
 
 #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_DEFAULT_H_
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_DEFAULT_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "components/password_manager/core/browser/password_store.h"
 
 namespace password_manager {
 
 // Simple password store implementation that delegates everything to
 // the LoginDatabase.
 class PasswordStoreDefault : public PasswordStore {
  public:
   // Takes ownership of |login_db|.
   PasswordStoreDefault(
       scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
       scoped_refptr<base::SingleThreadTaskRunner> db_thread_runner,
-      LoginDatabase* login_db);
+      const base::FilePath& login_db_file_path);
+
+  bool Init(const syncer::SyncableService::StartSyncFlare& flare) override;
+
+  // Used for testing.

[vabr (Chromium), 2015/01/05 13:47:05]

nit: Maybe be stricter and say: "Use only for testing."?

+  LoginDatabase* login_db() const {
+    return login_db_.get();
+  }
 
  protected:
   ~PasswordStoreDefault() override;
 
+  // Opens |login_db_| on the DB thread.
+  void InitOnDBThread();
+
   // Implements PasswordStore interface.
   void ReportMetricsImpl(const std::string& sync_username,
                          bool custom_passphrase_sync_enabled) override;
   PasswordStoreChangeList AddLoginImpl(
       const autofill::PasswordForm& form) override;
   PasswordStoreChangeList UpdateLoginImpl(
       const autofill::PasswordForm& form) override;
   PasswordStoreChangeList RemoveLoginImpl(
       const autofill::PasswordForm& form) override;
   PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(
@@ skipping 11 matching lines @@
       std::vector<autofill::PasswordForm*>* forms) override;
   bool FillBlacklistLogins(
       std::vector<autofill::PasswordForm*>* forms) override;
 
  protected:
   inline bool DeleteAndRecreateDatabaseFile() {
     return login_db_->DeleteAndRecreateDatabaseFile();
   }
 
  private:
+  base::FilePath login_db_file_path_;

[vabr (Chromium), 2015/01/05 13:47:05]

Could this be const?

+
+  // The SQLite login database, opened on the DB thread in a deferred manner.
+  // Will be NULL for the lifetime of |this| if opening fails.
   scoped_ptr<LoginDatabase> login_db_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreDefault);
 };
 
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_STORE_DEFAULT_H_