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, 13 insertions, 7 deletions

diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h
index 04eb1c5..ca56be1f 100644
--- a/net/disk_cache/disk_cache_test_base.h
+++ b/net/disk_cache/disk_cache_test_base.h
@@ -2,24 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H__
-#define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H__
+#ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
+#define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 
 #include "base/basictypes.h"
+#include "base/platform_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+// These tests can use the path service, which uses autoreleased objects on the
+// Mac, so this needs to be a PlatformTest.  Even tests that do not require a
+// cache (and that do not need to be a DiskCacheTestWithCache) are susceptible
+// to this problem; all such tests should use TEST_F(DiskCacheTest, ...).
+typedef PlatformTest DiskCacheTest;
+
 namespace disk_cache {
 
 class Backend;
 class BackendImpl;
 class MemBackendImpl;
 
-}
+}  // namespace disk_cache
 
 // Provides basic support for cache related tests.
-class DiskCacheTestBase : public testing::Test {
+class DiskCacheTestWithCache : public DiskCacheTest {
  protected:
-  DiskCacheTestBase()
+  DiskCacheTestWithCache()
       : cache_(NULL), cache_impl_(NULL), mem_cache_(NULL), mask_(0), size_(0),
         memory_only_(false), implementation_(false), force_creation_(false),
         first_cleanup_(true) {}
@@ -71,5 +78,4 @@ class DiskCacheTestBase : public testing::Test {
   void InitDiskCache();
 };
 
-#endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H__
-
+#endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_