Integrate PasswordStoreProxyMac instead of PasswordStoreMac.

chrome/browser/password_manager/password_store_proxy_mac.h

Index: chrome/browser/password_manager/password_store_proxy_mac.h
diff --git a/chrome/browser/password_manager/password_store_proxy_mac.h b/chrome/browser/password_manager/password_store_proxy_mac.h
index 8e1020915a8070f6670f6e837db96d58c084091b..67029cf3ceec3be5219ef9f0993db80496d74d6f 100644
--- a/chrome/browser/password_manager/password_store_proxy_mac.h
+++ b/chrome/browser/password_manager/password_store_proxy_mac.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_PROXY_MAC_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_PROXY_MAC_H_
 
+#include "base/threading/thread.h"
 #include "components/password_manager/core/browser/password_store.h"
 
 namespace crypto {
@@ -31,15 +32,24 @@ class PasswordStoreProxyMac : public password_manager::PasswordStore {
 
   bool Init(const syncer::SyncableService::StartSyncFlare& flare) override;
   void Shutdown() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetBackgroundTaskRunner()
+      override;
+
+#if defined(UNIT_TEST)
+  password_manager::LoginDatabase* login_metadata_db() {
+    return login_metadata_db_.get();
+  }
+#endif
 
  private:
   ~PasswordStoreProxyMac() override;
 
   password_manager::PasswordStore* GetBackend() const;
 
+  // Opens LoginDatabase on the background |thread_|.
+  void InitOnBackgroundThread();
+
   // PasswordStore:
-  scoped_refptr<base::SingleThreadTaskRunner> GetBackgroundTaskRunner()
-      override;
   void ReportMetricsImpl(const std::string& sync_username,
                          bool custom_passphrase_sync_enabled) override;
   password_manager::PasswordStoreChangeList AddLoginImpl(
@@ -57,10 +67,6 @@ class PasswordStoreProxyMac : public password_manager::PasswordStore {
   ScopedVector<autofill::PasswordForm> FillMatchingLogins(
       const autofill::PasswordForm& form,
       AuthorizationPromptPolicy prompt_policy) override;
-  void GetAutofillableLoginsImpl(
-      scoped_ptr<PasswordStore::GetLoginsRequest> request) override;
-  void GetBlacklistLoginsImpl(
-      scoped_ptr<PasswordStore::GetLoginsRequest> request) override;
   bool FillAutofillableLogins(
       ScopedVector<autofill::PasswordForm>* forms) override;
   bool FillBlacklistLogins(
@@ -74,6 +80,13 @@ class PasswordStoreProxyMac : public password_manager::PasswordStore {
   scoped_refptr<PasswordStoreMac> password_store_mac_;
   scoped_refptr<SimplePasswordStoreMac> password_store_simple_;
 
+  // The login metadata SQL database. If opening the DB on |thread_| fails,
+  // |login_metadata_db_| will be reset to NULL for the lifetime of |this|.
+  scoped_ptr<password_manager::LoginDatabase> login_metadata_db_;
+
+  // Thread that the synchronous methods are run on.
+  scoped_ptr<base::Thread> thread_;
+
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreProxyMac);
 };