Disk cache: Switch the disk cache to use the cache_thread....

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/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 18 matching lines @@
   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),
-        cache_thread_("CacheThread") {}
+        use_current_thread_(false), cache_thread_("CacheThread") {}
 
   void InitCache();
   virtual void TearDown();
   void SimulateCrash();
   void SetTestMode();
 
   void SetMemoryOnlyMode() {
     memory_only_ = true;
   }
 
@@ skipping 18 matching lines @@
   }
 
   void DisableFirstCleanup() {
     first_cleanup_ = false;
   }
 
   void DisableIntegrityCheck() {
     integrity_ = false;
   }
 
+  void UseCurrentThread() {
+    use_current_thread_ = true;
+  }
+
   // 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);
+  void FlushQueueForTest();
 
   // 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_;
+  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);
 
   base::Thread cache_thread_;
   DISALLOW_COPY_AND_ASSIGN(DiskCacheTestWithCache);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_