Run some disk cache unit tests on the Mac

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1475 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 7 deletions

diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc
index ebf4637..417792f 100644
--- a/net/disk_cache/disk_cache_test_base.cc
+++ b/net/disk_cache/disk_cache_test_base.cc
@@ -8,7 +8,7 @@
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/mem_backend_impl.h"
 
-void DiskCacheTestBase::SetMaxSize(int size) {
+void DiskCacheTestWithCache::SetMaxSize(int size) {
   size_ = size;
   if (cache_impl_)
     EXPECT_TRUE(cache_impl_->SetMaxSize(size));
@@ -17,7 +17,7 @@ void DiskCacheTestBase::SetMaxSize(int size) {
     EXPECT_TRUE(mem_cache_->SetMaxSize(size));
 }
 
-void DiskCacheTestBase::InitCache() {
+void DiskCacheTestWithCache::InitCache() {
   if (mask_)
     implementation_ = true;
 
@@ -31,7 +31,7 @@ void DiskCacheTestBase::InitCache() {
     ASSERT_EQ(0, cache_->GetEntryCount());
 }
 
-void DiskCacheTestBase::InitMemoryCache() {
+void DiskCacheTestWithCache::InitMemoryCache() {
   if (!implementation_) {
     cache_ = disk_cache::CreateInMemoryCacheBackend(size_);
     return;
@@ -47,7 +47,7 @@ void DiskCacheTestBase::InitMemoryCache() {
   ASSERT_TRUE(mem_cache_->Init());
 }
 
-void DiskCacheTestBase::InitDiskCache() {
+void DiskCacheTestWithCache::InitDiskCache() {
   std::wstring path = GetCachePath();
   if (first_cleanup_)
     ASSERT_TRUE(DeleteCache(path.c_str()));
@@ -72,17 +72,19 @@ void DiskCacheTestBase::InitDiskCache() {
 }
 
 
-void DiskCacheTestBase::TearDown() {
+void DiskCacheTestWithCache::TearDown() {
   delete cache_;
 
   if (!memory_only_) {
     std::wstring path = GetCachePath();
     EXPECT_TRUE(CheckCacheIntegrity(path));
   }
+
+  PlatformTest::TearDown();
 }
 
 // We are expected to leak memory when simulating crashes.
-void DiskCacheTestBase::SimulateCrash() {
+void DiskCacheTestWithCache::SimulateCrash() {
   ASSERT_TRUE(implementation_ && !memory_only_);
   cache_impl_->ClearRefCountForTest();
 
@@ -102,7 +104,7 @@ void DiskCacheTestBase::SimulateCrash() {
   ASSERT_TRUE(cache_impl_->Init());
 }
 
-void DiskCacheTestBase::SetTestMode() {
+void DiskCacheTestWithCache::SetTestMode() {
   ASSERT_TRUE(implementation_ && !memory_only_);
   cache_impl_->SetUnitTestMode();
 }