diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:54:15 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 03:54:15 +0000 |
| commit | ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a (patch) | |
| tree | b7e5213fb01b0f422bb2fd0eb7da523c08de717a /chrome/browser/webdata/web_data_service_unittest.cc | |
| parent | 2a6f339074bff557adb5253d7165b493a5d758ee (diff) | |
| download | chromium_src-ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a.zip chromium_src-ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a.tar.gz chromium_src-ba30c18a957290ff02ab9872a1a9dd8c4ee2f14a.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
Review URL: https://chromiumcodereview.appspot.com/10185008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136499 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()); |