| 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 6c60f984a67d9fff7ad5fd6a79a2f1bad79c09cf..17672723a70aa477538c444204e05a50e03b187d 100644 | 
| --- a/chrome/browser/password_manager/simple_password_store_mac.cc | 
| +++ b/chrome/browser/password_manager/simple_password_store_mac.cc | 
| @@ -10,16 +10,21 @@ SimplePasswordStoreMac::SimplePasswordStoreMac( | 
| scoped_ptr<password_manager::LoginDatabase> login_db) | 
| : PasswordStoreDefault(main_thread_runner, background_thread_runner, | 
| login_db.Pass()) { | 
| -  this->login_db()->set_clear_password_values(false); | 
| +  if (this->login_db()) | 
| +    this->login_db()->set_clear_password_values(false); | 
| } | 
|  | 
| SimplePasswordStoreMac::~SimplePasswordStoreMac() { | 
| } | 
|  | 
| -bool SimplePasswordStoreMac::Init( | 
| -    const syncer::SyncableService::StartSyncFlare& flare) { | 
| -  // All the initialization has to be done by the owner of the object. | 
| -  return true; | 
| +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); | 
| } | 
|  | 
| void SimplePasswordStoreMac::Shutdown() { | 
|  |