Disk cache: Update the remove/insert data files.

net/tools/crash_cache/crash_cache.cc

Index: net/tools/crash_cache/crash_cache.cc
===================================================================
--- net/tools/crash_cache/crash_cache.cc	(revision 110241)
+++ net/tools/crash_cache/crash_cache.cc	(working copy)
@@ -132,15 +132,22 @@
   cb.GetResult(rv);  // Ignore the result;
 }
 
+bool CreateCache(const FilePath& path, base::Thread* thread,
+                 disk_cache::Backend** cache, TestOldCompletionCallback* cb) {
+  int size = 1024 * 1024;
+  int rv = disk_cache::BackendImpl::CreateBackend(
+               path, false, size, net::DISK_CACHE, disk_cache::kNoRandom,
+               thread->message_loop_proxy(), NULL, cache, cb);
+
+  return (cb->GetResult(rv) == net::OK && !(*cache)->GetEntryCount());
+}

[gavinp, 2011/11/28 16:15:01]

I take it that crash_cache.cc had bitrotted because of the client/server changes
in the cache architecture?

[rvargas (doing something else), 2011/11/28 19:06:18]

Kind of. Without this change, it sometimes generates files that have an explicit
2.1 version number (so tests that require 2.0 fail), and the size of the index
can be 512k, depending on where the program runs.

+
 // Generates the files for an empty and one item cache.
 int SimpleInsert(const FilePath& path, RankCrashes action,
                  base::Thread* cache_thread) {
   TestOldCompletionCallback cb;
   disk_cache::Backend* cache;
-  int rv = disk_cache::CreateCacheBackend(net::DISK_CACHE, path, 0, false,
-                                          cache_thread->message_loop_proxy(),
-                                          NULL, &cache, &cb);
-  if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
+  if (!CreateCache(path, cache_thread, &cache, &cb))
     return GENERIC;
 
   const char* test_name = "some other key";
@@ -151,7 +158,7 @@
   }
 
   disk_cache::Entry* entry;
-  rv = cache->CreateEntry(test_name, &entry, &cb);
+  int rv = cache->CreateEntry(test_name, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
@@ -177,15 +184,11 @@
 
   TestOldCompletionCallback cb;
   disk_cache::Backend* cache;
-  // Use a simple LRU for eviction.
-  int rv = disk_cache::CreateCacheBackend(net::MEDIA_CACHE, path, 0, false,
-                                          cache_thread->message_loop_proxy(),
-                                          NULL, &cache, &cb);
-  if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
+  if (!CreateCache(path, cache_thread, &cache, &cb))
     return GENERIC;
 
   disk_cache::Entry* entry;
-  rv = cache->CreateEntry(kCrashEntryName, &entry, &cb);
+  int rv = cache->CreateEntry(kCrashEntryName, &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
@@ -220,15 +223,11 @@
 
   TestOldCompletionCallback cb;
   disk_cache::Backend* cache;
-  // Use a simple LRU for eviction.
-  int rv = disk_cache::CreateCacheBackend(net::MEDIA_CACHE, path, 0, false,
-                                          cache_thread->message_loop_proxy(),
-                                          NULL, &cache, &cb);
-  if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())
+  if (!CreateCache(path, cache_thread, &cache, &cb))
     return GENERIC;
 
   disk_cache::Entry* entry;
-  rv = cache->CreateEntry("some other key", &entry, &cb);
+  int rv = cache->CreateEntry("some other key", &entry, &cb);
   if (cb.GetResult(rv) != net::OK)
     return GENERIC;
 
@@ -264,6 +263,8 @@
   if (!cache || !cache->SetMaxSize(0x100000))
     return GENERIC;
 
+  // No experiments and use a simple LRU.
+  cache->SetFlags(disk_cache::kNoRandom);
   TestOldCompletionCallback cb;
   int rv = cache->Init(&cb);
   if (cb.GetResult(rv) != net::OK || cache->GetEntryCount())