summaryrefslogtreecommitdiffstats
path: root/net/disk_cache
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-13 02:12:25 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-13 02:12:25 +0000
commitde677dc51a20170ea84e0a08df732520dca78772 (patch)
treecb2ba677a1b721f087fd3c6058c85a2899e27fc9 /net/disk_cache
parent7c8c01250b48dfe2ec51348032a9c68eb064709a (diff)
downloadchromium_src-de677dc51a20170ea84e0a08df732520dca78772.zip
chromium_src-de677dc51a20170ea84e0a08df732520dca78772.tar.gz
chromium_src-de677dc51a20170ea84e0a08df732520dca78772.tar.bz2
Be more thorough when tearing down DiskCacheTestWithCache.
Fixes memory leaks. Also, fix the teardown hierarchy. BUG=278187 R=gavinp@chromium.org Review URL: https://chromiumcodereview.appspot.com/23622030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r--net/disk_cache/disk_cache_test_base.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc
index 34913c7..3cf98a86 100644
--- a/net/disk_cache/disk_cache_test_base.cc
+++ b/net/disk_cache/disk_cache_test_base.cc
@@ -250,8 +250,9 @@ void DiskCacheTestWithCache::TearDown() {
if (!memory_only_ && !simple_cache_mode_ && integrity_) {
EXPECT_TRUE(CheckCacheIntegrity(cache_path_, new_eviction_, mask_));
}
-
- PlatformTest::TearDown();
+ base::RunLoop().RunUntilIdle();
+ disk_cache::SimpleBackendImpl::FlushWorkerPoolForTesting();
+ DiskCacheTest::TearDown();
}
void DiskCacheTestWithCache::InitMemoryCache() {