Disk cache: Update the disk cache tools and tests to use...

net/disk_cache/disk_cache_test_base.h

 // 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 "base/thread.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();
 };
 
 // Provides basic support for cache related tests.
 class DiskCacheTestWithCache : public DiskCacheTest {
  protected:
   DiskCacheTestWithCache()
       : cache_(NULL), cache_impl_(NULL), mem_cache_(NULL), mask_(0), size_(0),
         memory_only_(false), implementation_(false), force_creation_(false),
-        new_eviction_(false), first_cleanup_(true), integrity_(true) {}
+        new_eviction_(false), first_cleanup_(true), integrity_(true),
+        cache_thread_("CacheThread") {}
 
   void InitCache();
   virtual void TearDown();
   void SimulateCrash();
   void SetTestMode();
 
   void SetMemoryOnlyMode() {
     memory_only_ = true;
   }
 
@@ skipping 49 matching lines @@
   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);
+
+  base::Thread cache_thread_;
+  DISALLOW_COPY_AND_ASSIGN(DiskCacheTestWithCache);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_