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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/disk_cache/disk_cache_test_util.h"
 
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/backend_impl.h"
 #include "net/disk_cache/cache_util.h"
 #include "net/disk_cache/file.h"
 
 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);
 
   key[199] = '\0';
   return std::string(key);
 }
 
 void CacheTestFillBuffer(char* buffer, size_t len, bool no_nulls) {
   static bool called = false;
   if (!called) {
     called = true;
     int seed = static_cast<int>(Time::Now().ToInternalValue());
     srand(seed);
   }
 
   for (size_t i = 0; i < len; i++) {
     buffer[i] = static_cast<char>(rand());
     if (!buffer[i] && no_nulls)
       buffer[i] = 'g';
   }
   if (len && !buffer[0])
     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 |
               base::PLATFORM_FILE_WRITE;
 
   scoped_refptr<disk_cache::File> file(new disk_cache::File(
       base::CreatePlatformFile(name, flags, NULL, NULL)));
   if (!file->IsValid())
     return false;
 
@@ skipping 12 matching lines @@
   if (!cache.get())
     return false;
   if (new_eviction)
     cache->SetNewEviction();
   cache->SetFlags(disk_cache::kNoRandom);
   if (cache->SyncInit() != net::OK)
     return false;
   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()
     : num_callbacks_(0),
       num_iterations_(0),
       last_(0),
       completed_(false),
       callback_reused_error_(false),
       callbacks_called_(0) {
 }
@@ skipping 48 matching lines @@
 void CallbackTest::Run(int params) {
   if (reuse_) {
     DCHECK_EQ(1, reuse_);
     if (2 == reuse_)
       helper_->set_callback_reused_error(true);
     reuse_++;
   }
 
   helper_->CallbackWasCalled();
 }