diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:49:46 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:49:46 +0000 |
| commit | d07edd42ce09a444f435c0dcffd4a123dc6f31b9 (patch) | |
| tree | 171e5756c9b49514e7fe6ab43cb1ecd60e0acd4f /chrome/browser/webdata/web_data_service_unittest.cc | |
| parent | b6da6b187ffec9d19a990c0c058864571bd01a8e (diff) | |
| download | chromium_src-d07edd42ce09a444f435c0dcffd4a123dc6f31b9.zip chromium_src-d07edd42ce09a444f435c0dcffd4a123dc6f31b9.tar.gz chromium_src-d07edd42ce09a444f435c0dcffd4a123dc6f31b9.tar.bz2 | |
Taking over issue 10006037.
Moved WebDataService to ProfileKeyedService
James:
chrome\browser\ui\intents
Peter:
chrome\browser\ui\search_engines
chrome\browser\search_engines
Nicolas:
chrome\browser\sync
Rachel/Elliot:
chrome\browser\profiles and the whole cl
BUG=112234
TEST=unit-tests
TBR=jhawkins@chromium.org,pkasting@chromium.org,zea@chromium.org,erg@chromium.org,isherman@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136499
Review URL: https://chromiumcodereview.appspot.com/10185008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata/web_data_service_unittest.cc')
| -rw-r--r-- | chrome/browser/webdata/web_data_service_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 4cb1927..1023bb1 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -88,8 +88,12 @@ class WebDataServiceTest : public testing::Test { } 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()); |