Disk cache" Convert some of the unit tests to the new...

net/disk_cache/disk_cache_test_base.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2010 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_
 
 #include "base/basictypes.h"
+#include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 class FilePath;
 
 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 {
   virtual void TearDown();
@@ skipping 37 matching lines @@
   }
 
   void DisableFirstCleanup() {
     first_cleanup_ = false;
   }
 
   void DisableIntegrityCheck() {
     integrity_ = false;
   }
 
+  // Utility methods to access the cache and wait for each operation to finish.
+  int OpenEntry(const std::string& key, disk_cache::Entry** entry);
+  int CreateEntry(const std::string& key, disk_cache::Entry** entry);
+  int DoomEntry(const std::string& key);
+  int DoomAllEntries();
+  int DoomEntriesBetween(const base::Time initial_time,
+                         const base::Time end_time);
+  int DoomEntriesSince(const base::Time initial_time);
+  int OpenNextEntry(void** iter, disk_cache::Entry** next_entry);
+
   // cache_ will always have a valid object, regardless of how the cache was
   // initialized. The implementation pointers can be NULL.
   disk_cache::Backend* cache_;
   disk_cache::BackendImpl* cache_impl_;
   disk_cache::MemBackendImpl* mem_cache_;
 
   uint32 mask_;
   int size_;
   bool memory_only_;
   bool implementation_;
   bool force_creation_;
   bool new_eviction_;
   bool first_cleanup_;
   bool integrity_;
   // This is intentionally left uninitialized, to be used by any test.
   bool success_;
 
  private:
   void InitMemoryCache();
   void InitDiskCache();
   void InitDiskCacheImpl(const FilePath& path);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_