Disk cache: Simplyfy some of the test infrastructure.

net/disk_cache/disk_cache_test_base.h

 // 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.
 
 #ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 #define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "net/base/cache_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
-class FilePath;
-
 namespace net {
 
 class IOBuffer;
 
 }  // namespace net
 
 namespace disk_cache {
 
 class Backend;
 class BackendImpl;
 class Entry;
 class MemBackendImpl;
 
 }  // namespace disk_cache
 
 // 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, ...).
 class DiskCacheTest : public PlatformTest {
+ protected:
+  DiskCacheTest();
+  virtual ~DiskCacheTest();
+
+  // Copies a set of cache files from the data folder to the test folder.
+  bool CopyTestCache(const std::string& name);
+
+  // Deletes the contents of |cache_path_|.
+  bool CleanupCacheDir();
+
   virtual void TearDown();
+
+  FilePath cache_path_;
+
+ private:
+  scoped_ptr<MessageLoop> message_loop_;
 };
 
 // Provides basic support for cache related tests.
 class DiskCacheTestWithCache : public DiskCacheTest {
  protected:
   DiskCacheTestWithCache();
   virtual ~DiskCacheTestWithCache();
 
   void InitCache();
   void SimulateCrash();
@@ skipping 85 matching lines @@
   bool new_eviction_;
   bool first_cleanup_;
   bool integrity_;
   bool use_current_thread_;
   // This is intentionally left uninitialized, to be used by any test.
   bool success_;
 
  private:
   void InitMemoryCache();
   void InitDiskCache();
-  void InitDiskCacheImpl(const FilePath& path);
+  void InitDiskCacheImpl();
 
   base::Thread cache_thread_;
   DISALLOW_COPY_AND_ASSIGN(DiskCacheTestWithCache);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_