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

net/disk_cache/disk_cache_test_util.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_DISK_CACHE_DISK_CACHE_TEST_UTIL_H_
 #define NET_DISK_CACHE_DISK_CACHE_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "base/tuple.h"
 #include "build/build_config.h"
 
 // Re-creates a given test file inside the cache test folder.
 bool CreateCacheTestFile(const FilePath& name);
 
 // Deletes all file son the cache.
 bool DeleteCache(const FilePath& path);
 
-// Gets the path to the cache test folder.
-FilePath GetCacheFilePath();
-
 // Fills buffer with random values (may contain nulls unless no_nulls is true).
 void CacheTestFillBuffer(char* buffer, size_t len, bool no_nulls);
 
 // Generates a random key of up to 200 bytes.
 std::string GenerateKey(bool same_length);
 
 // Returns true if the cache is not corrupt.
 bool CheckCacheIntegrity(const FilePath& path, bool new_eviction, uint32 mask);
 
-// Helper class which ensures that the cache dir returned by GetCacheFilePath
-// exists and is clear in ctor and that the directory gets deleted in dtor.
-class ScopedTestCache {
- public:
-  explicit ScopedTestCache(const FilePath& path);
-  // Use a specific folder name.
-  explicit ScopedTestCache(const std::string& name);
-  ~ScopedTestCache();
-
-  FilePath path() const { return path_; }
-
- private:
-  const FilePath path_;  // Path to the cache test folder.
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedTestCache);
-};
-
 // -----------------------------------------------------------------------
 
 // Simple helper to deal with the message loop on a test.
 class MessageLoopHelper {
  public:
   MessageLoopHelper();
   ~MessageLoopHelper();
 
   // Run the message loop and wait for num_callbacks before returning. Returns
   // false if we are waiting to long. Each callback that will be waited on is
@@ skipping 51 matching lines @@
 
   void Run(int params);
 
  private:
   MessageLoopHelper* helper_;
   int reuse_;
   DISALLOW_COPY_AND_ASSIGN(CallbackTest);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_UTIL_H_