Run the disk cache tests in scoped temporary directories instead of a fixed directory so that they …

net/disk_cache/disk_cache_test_util.cc

Index: net/disk_cache/disk_cache_test_util.cc
===================================================================
--- net/disk_cache/disk_cache_test_util.cc	(revision 151735)
+++ net/disk_cache/disk_cache_test_util.cc	(working copy)
@@ -16,20 +16,6 @@
 using base::Time;
 using base::TimeDelta;
 
-namespace {
-
-FilePath BuildCachePath(const std::string& name) {
-  FilePath path;
-  PathService::Get(base::DIR_TEMP, &path);  // Ignore return value;
-  path = path.AppendASCII(name);
-  if (!file_util::PathExists(path))
-    file_util::CreateDirectory(path);
-
-  return path;
-}
-
-}  // namespace.
-
 std::string GenerateKey(bool same_length) {
   char key[200];
   CacheTestFillBuffer(key, sizeof(key), same_length);
@@ -55,10 +41,6 @@
     buffer[0] = 'g';
 }
 
-FilePath GetCacheFilePath() {
-  return BuildCachePath("cache_test");
-}
-
 bool CreateCacheTestFile(const FilePath& name) {
   int flags = base::PLATFORM_FILE_CREATE_ALWAYS |
               base::PLATFORM_FILE_READ |
@@ -91,21 +73,6 @@
   return cache->SelfCheck() >= 0;
 }
 
-ScopedTestCache::ScopedTestCache(const FilePath& path) : path_(path) {
-  bool result = DeleteCache(path_);
-  DCHECK(result);
-}
-
-ScopedTestCache::ScopedTestCache(const std::string& name)
-    : path_(BuildCachePath(name)) {
-  bool result = DeleteCache(path_);
-  DCHECK(result);
-}
-
-ScopedTestCache::~ScopedTestCache() {
-  file_util::Delete(path(), true);
-}
-
 // -----------------------------------------------------------------------
 
 MessageLoopHelper::MessageLoopHelper()