Disk cache: Simplyfy some of the test infrastructure.

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"
@@ skipping 60 matching lines @@
 
   file->SetLength(4 * 1024 * 1024);
   return true;
 }
 
 bool DeleteCache(const FilePath& path) {
   disk_cache::DeleteCache(path, false);
   return true;
 }
 
-bool CopyTestCache(const std::string& name) {
-  FilePath path;
-  PathService::Get(base::DIR_SOURCE_ROOT, &path);
-  path = path.AppendASCII("net");
-  path = path.AppendASCII("data");
-  path = path.AppendASCII("cache_tests");
-  path = path.AppendASCII(name);
-
-  FilePath dest = GetCacheFilePath();
-  if (!DeleteCache(dest))
-    return false;
-  return file_util::CopyDirectory(path, dest, false);
-}
-
 bool CheckCacheIntegrity(const FilePath& path, bool new_eviction, uint32 mask) {
   scoped_ptr<disk_cache::BackendImpl> cache(new disk_cache::BackendImpl(
       path, mask, base::MessageLoopProxy::current(), NULL));
   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() : path_(GetCacheFilePath()) {
+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);
 }
 
@@ skipping 62 matching lines @@
 void CallbackTest::RunWithParams(const Tuple1<int>& params) {
   if (reuse_) {
     DCHECK_EQ(1, reuse_);
     if (2 == reuse_)
       helper_->set_callback_reused_error(true);
     reuse_++;
   }
 
   helper_->CallbackWasCalled();
 }