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..a16673d984a13d5c88867804d5feebbf438a443f 100644 |
--- a/chrome/browser/password_manager/simple_password_store_mac.cc |
+++ b/chrome/browser/password_manager/simple_password_store_mac.cc |
@@ -10,18 +10,25 @@ 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); |
stuartmorgan
2015/07/07 17:40:25
Is it useful to keep this, now that it's done in I
vasilii
2015/07/08 09:56:58
Yes, because InitWithTaskRunner isn't necessary to
stuartmorgan
2015/07/08 14:18:40
Please clarify that in the header comment for IWTR
vasilii
2015/07/08 15:45:54
Done.
|
} |
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() { |
- PasswordStoreDefault::Shutdown(); |
+bool SimplePasswordStoreMac::Init( |
+ const syncer::SyncableService::StartSyncFlare& flare) { |
+ NOTREACHED(); |
+ return false; |
} |