Start the migration of passwords from the Keychain.

chrome/browser/password_manager/simple_password_store_mac.h

Index: chrome/browser/password_manager/simple_password_store_mac.h
diff --git a/chrome/browser/password_manager/simple_password_store_mac.h b/chrome/browser/password_manager/simple_password_store_mac.h
index 3e046b9ea4369df836d266eab9814fbb48071cec..71309fdbdd936db22439effb7c7a3f06b08b633f 100644
--- a/chrome/browser/password_manager/simple_password_store_mac.h
+++ b/chrome/browser/password_manager/simple_password_store_mac.h
@@ -11,17 +11,18 @@
 // owner is responsible for the thread lifetime.
 class SimplePasswordStoreMac : public password_manager::PasswordStoreDefault {
  public:
+  // Passes the arguments to PasswordStoreDefault. |background_task_runner| and
+  // |login_db| can be overwritten later in InitWithTaskRunner().
   SimplePasswordStoreMac(
       scoped_refptr<base::SingleThreadTaskRunner> main_thread_runner,
       scoped_refptr<base::SingleThreadTaskRunner> background_thread_runner,
       scoped_ptr<password_manager::LoginDatabase> login_db);
 
-  // Just hides the parent method. All the initialization is to be done by
-  // PasswordStoreProxyMac that is an owner of the class.
-  bool Init(const syncer::SyncableService::StartSyncFlare& flare) override;
-
-  // Clean |background_thread_runner_|.
-  void Shutdown() override;
+  // Sets the background thread and LoginDatabase. |login_db| should be already
+  // inited.
+  void InitWithTaskRunner(
+      scoped_refptr<base::SingleThreadTaskRunner> background_task_runner,
+      scoped_ptr<password_manager::LoginDatabase> login_db);
 
   using PasswordStoreDefault::GetBackgroundTaskRunner;
 
@@ -29,6 +30,8 @@ class SimplePasswordStoreMac : public password_manager::PasswordStoreDefault {
   ~SimplePasswordStoreMac() override;
 
  private:
+  bool Init(const syncer::SyncableService::StartSyncFlare& flare) override;
+
   DISALLOW_COPY_AND_ASSIGN(SimplePasswordStoreMac);
 };