| Index: chrome/browser/ui/intents/web_intents_model_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/intents/web_intents_model_unittest.cc (revision 136877)
|
| +++ chrome/browser/ui/intents/web_intents_model_unittest.cc (working copy)
|
| @@ -34,9 +34,12 @@
|
| }
|
|
|
| virtual void TearDown() {
|
| - if (wds_.get())
|
| - 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();
|
| db_thread_.Stop();
|
| MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
|
| MessageLoop::current()->Run();
|
|
|