summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 21:39:50 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 21:39:50 +0000
commit0cf5b9c3c3bd06e0cfcdbc07b9748d08689235b9 (patch)
tree3e00dd1c59b95c075965e712a1680a77fe2e716d
parentf41301e22f97b5117f8b6ada563d7916b01fe56c (diff)
downloadchromium_src-0cf5b9c3c3bd06e0cfcdbc07b9748d08689235b9.zip
chromium_src-0cf5b9c3c3bd06e0cfcdbc07b9748d08689235b9.tar.gz
chromium_src-0cf5b9c3c3bd06e0cfcdbc07b9748d08689235b9.tar.bz2
Fix intermittent DCHECK failure in BlacklistManagerTest.
Ensure correct shutdown of threads. TEST=Covered by unit_tests. BUG=27726 Review URL: http://codereview.chromium.org/384149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32090 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/privacy_blacklist/blacklist_manager_unittest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/privacy_blacklist/blacklist_manager_unittest.cc b/chrome/browser/privacy_blacklist/blacklist_manager_unittest.cc
index 51814e7..f432381 100644
--- a/chrome/browser/privacy_blacklist/blacklist_manager_unittest.cc
+++ b/chrome/browser/privacy_blacklist/blacklist_manager_unittest.cc
@@ -96,6 +96,7 @@ class BlacklistManagerTest : public testing::Test, public NotificationObserver {
}
virtual void TearDown() {
+ mock_file_thread_.Stop();
loop_.RunAllPending();
}