Disk cache: Stop evictions while performing final cleanup....

net/disk_cache/backend_impl.cc

Index: net/disk_cache/backend_impl.cc
===================================================================
--- net/disk_cache/backend_impl.cc	(revision 52792)
+++ net/disk_cache/backend_impl.cc	(working copy)
@@ -259,7 +259,7 @@
 };
 
 void FinalCleanup::Run() {
-  backend_->CleanupCache();
+  backend_->StartCleanup();
 }
 
 }  // namespace
@@ -525,6 +525,15 @@
   return disabled_ ? net::ERR_FAILED : net::OK;
 }
 
+void BackendImpl::StartCleanup() {
+  Trace("Backend StartCleanup");
+  eviction_.Stop();
+
+  // Give a chance for any posted evictions to be discarded.
+  MessageLoop::current()->PostTask(FROM_HERE,
+        factory_.NewRunnableMethod(&BackendImpl::CleanupCache));
+}
+
 void BackendImpl::CleanupCache() {
   Trace("Backend Cleanup");
   if (init_) {