Revert 51456 - Disk cache: Switch the disk cache to use the cache_thread....

net/tools/crash_cache/crash_cache.cc

 // 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.
 
 // This command-line program generates the set of files needed for the crash-
 // cache unit tests (DiskCacheTest,CacheBackend_Recover*). This program only
 // works properly on debug mode, because the crash functionality is not compiled
 // on release builds of the cache.
 
 #include <string>
@@ skipping 100 matching lines @@
   DCHECK(action > disk_cache::NO_CRASH && action < disk_cache::MAX_CRASH);
 
   *full_path = path.AppendASCII(folders[action]);
 
   if (file_util::PathExists(*full_path))
     return false;
 
   return file_util::CreateDirectory(*full_path);
 }
 
-// Makes sure that any pending task is processed.
-void FlushQueue(disk_cache::Backend* cache) {
-  TestCompletionCallback cb;
-  int rv =
-      reinterpret_cast<disk_cache::BackendImpl*>(cache)->FlushQueueForTest(&cb);
-  cb.GetResult(rv);  // Ignore the result;
-}
-
 // Generates the files for an empty and one item cache.
 int SimpleInsert(const FilePath& path, RankCrashes action,
                  base::Thread* cache_thread) {
   TestCompletionCallback cb;
   disk_cache::Backend* cache;
   int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, path, 0, false,
                                           cache_thread->message_loop_proxy(),
                                           &cache, &cb);
   if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
     return GENERIC;
 
   const char* test_name = "some other key";
 
   if (action <= disk_cache::INSERT_EMPTY_3) {
     test_name = kCrashEntryName;
     g_rankings_crash = action;
   }
 
   disk_cache::Entry* entry;
   rv = cache->CreateEntry(test_name, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   entry->Close();
-  FlushQueue(cache);
 
   DCHECK(action <= disk_cache::INSERT_ONE_3);
   g_rankings_crash = action;
   test_name = kCrashEntryName;
 
   rv = cache->CreateEntry(test_name, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   return NOT_REACHED;
 }
 
 // Generates the files for a one item cache, and removing the head.
 int SimpleRemove(const FilePath& path, RankCrashes action,
                  base::Thread* cache_thread) {
   DCHECK(action >= disk_cache::REMOVE_ONE_1);
   DCHECK(action <= disk_cache::REMOVE_TAIL_3);
 
   TestCompletionCallback cb;
   disk_cache::Backend* cache;
-  // Use a simple LRU for eviction.
-  int rv = disk_cache::CreateCacheBackend(net::MEDIA_CACHE, path, 0, false,
+  int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, path, 0, false,
                                           cache_thread->message_loop_proxy(),
                                           &cache, &cb);
   if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
     return GENERIC;
 
   disk_cache::Entry* entry;
   rv = cache->CreateEntry(kCrashEntryName, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   entry->Close();
-  FlushQueue(cache);
 
   if (action >= disk_cache::REMOVE_TAIL_1) {
     rv = cache->CreateEntry("some other key", &entry, &cb);
     if (cb.GetResult(rv) != net::OK)
       return GENERIC;
 
     entry->Close();
-    FlushQueue(cache);
   }
 
   rv = cache->OpenEntry(kCrashEntryName, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   g_rankings_crash = action;
   entry->Doom();
   entry->Close();
-  FlushQueue(cache);
 
   return NOT_REACHED;
 }
 
 int HeadRemove(const FilePath& path, RankCrashes action,
                base::Thread* cache_thread) {
   DCHECK(action >= disk_cache::REMOVE_HEAD_1);
   DCHECK(action <= disk_cache::REMOVE_HEAD_4);
 
   TestCompletionCallback cb;
   disk_cache::Backend* cache;
-  // Use a simple LRU for eviction.
-  int rv = disk_cache::CreateCacheBackend(net::MEDIA_CACHE, path, 0, false,
+  int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, path, 0, false,
                                           cache_thread->message_loop_proxy(),
                                           &cache, &cb);
   if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
     return GENERIC;
 
   disk_cache::Entry* entry;
   rv = cache->CreateEntry("some other key", &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   entry->Close();
-  FlushQueue(cache);
   rv = cache->CreateEntry(kCrashEntryName, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   entry->Close();
-  FlushQueue(cache);
 
   rv = cache->OpenEntry(kCrashEntryName, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   g_rankings_crash = action;
   entry->Doom();
   entry->Close();
-  FlushQueue(cache);
 
   return NOT_REACHED;
 }
 
 // Generates the files for insertion and removals on heavy loaded caches.
 int LoadOperations(const FilePath& path, RankCrashes action,
                    base::Thread* cache_thread) {
   DCHECK(action >= disk_cache::INSERT_LOAD_1);
 
   // Work with a tiny index table (16 entries).
   disk_cache::BackendImpl* cache = new disk_cache::BackendImpl(
       path, 0xf, cache_thread->message_loop_proxy());
   if (!cache || !cache->SetMaxSize(0x100000))
     return GENERIC;
 
-  TestCompletionCallback cb;
-  int rv = cache->Init(&cb);
-  if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
+  if (!cache->Init() || cache->GetEntryCount())
     return GENERIC;
 
   int seed = static_cast<int>(Time::Now().ToInternalValue());
   srand(seed);
 
+  TestCompletionCallback cb;
+  int rv;
   disk_cache::Entry* entry;
   for (int i = 0; i < 100; i++) {
     std::string key = GenerateKey(true);
     rv = cache->CreateEntry(key, &entry, &cb);
     if (cb.GetResult(rv) != net::OK)
       return GENERIC;
     entry->Close();
-    FlushQueue(cache);
     if (50 == i && action >= disk_cache::REMOVE_LOAD_1) {
       rv = cache->CreateEntry(kCrashEntryName, &entry, &cb);
       if (cb.GetResult(rv) != net::OK)
         return GENERIC;
       entry->Close();
-      FlushQueue(cache);
     }
   }
 
   if (action <= disk_cache::INSERT_LOAD_2) {
     g_rankings_crash = action;
 
     rv = cache->CreateEntry(kCrashEntryName, &entry, &cb);
     if (cb.GetResult(rv) != net::OK)
       return GENERIC;
   }
 
   rv = cache->OpenEntry(kCrashEntryName, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
   g_rankings_crash = action;
 
   entry->Doom();
   entry->Close();
-  FlushQueue(cache);
 
   return NOT_REACHED;
 }
 
 // Main function on the child process.
 int SlaveCode(const FilePath& path, RankCrashes action) {
   MessageLoopForIO message_loop;
 
   FilePath full_path;
   if (!CreateTargetFolder(path, action, &full_path)) {
@@ skipping 45 matching lines @@
 
   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("new_crashes");
 
   return SlaveCode(path, action);
 }