Revert "Start the migration of passwords from the Keychain."

chrome/browser/password_manager/simple_password_store_mac.cc

Index: chrome/browser/password_manager/simple_password_store_mac.cc
diff --git a/chrome/browser/password_manager/simple_password_store_mac.cc b/chrome/browser/password_manager/simple_password_store_mac.cc
index a16673d984a13d5c88867804d5feebbf438a443f..6c60f984a67d9fff7ad5fd6a79a2f1bad79c09cf 100644
--- a/chrome/browser/password_manager/simple_password_store_mac.cc
+++ b/chrome/browser/password_manager/simple_password_store_mac.cc
@@ -10,25 +10,18 @@ SimplePasswordStoreMac::SimplePasswordStoreMac(
     scoped_ptr<password_manager::LoginDatabase> login_db)
     : PasswordStoreDefault(main_thread_runner, background_thread_runner,
                            login_db.Pass()) {
-  if (this->login_db())
-    this->login_db()->set_clear_password_values(false);
+  this->login_db()->set_clear_password_values(false);
 }
 
 SimplePasswordStoreMac::~SimplePasswordStoreMac() {
 }
 
-void SimplePasswordStoreMac::InitWithTaskRunner(
-    scoped_refptr<base::SingleThreadTaskRunner> background_task_runner,
-    scoped_ptr<password_manager::LoginDatabase> login_db) {
-  db_thread_runner_ = background_task_runner;
-  DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());
-  set_login_db(login_db.Pass());
-  if (this->login_db())
-    this->login_db()->set_clear_password_values(false);
-}
-
 bool SimplePasswordStoreMac::Init(
     const syncer::SyncableService::StartSyncFlare& flare) {
-  NOTREACHED();
-  return false;
+  // All the initialization has to be done by the owner of the object.
+  return true;
+}
+
+void SimplePasswordStoreMac::Shutdown() {
+  PasswordStoreDefault::Shutdown();
 }