Index: chrome/browser/password_manager/password_store_default_unittest.cc |
diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc |
index 16862446ed91b4fa6f80162b567d91b9b05c7316..1d1e94051a690abac43c0086fe91de2c6878b8d4 100644 |
--- a/chrome/browser/password_manager/password_store_default_unittest.cc |
+++ b/chrome/browser/password_manager/password_store_default_unittest.cc |
@@ -123,7 +123,12 @@ class PasswordStoreDefaultTest : public testing::Test { |
} |
virtual void TearDown() { |
- wds_->Shutdown(); |
+ wds_->ShutdownOnUIThread(); |
+ wds_ = NULL; |
+ base::WaitableEvent done(false, false); |
+ BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
+ base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done))); |
+ done.Wait(); |
MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
MessageLoop::current()->Run(); |
db_thread_.Stop(); |